# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1554594761 -32400
# Node ID 2a48690b8cbc3a89181dad83a9bbb0192123098b
# Parent  1f7d6999ed4c23a2728418ed6f21b7c5c0460052
Put $S4NAME in title

diff -r 1f7d6999ed4c -r 2a48690b8cbc examples/common/default/html.m4.html
--- a/examples/common/default/html.m4.html	Sat Apr 06 21:34:53 2019 +0900
+++ b/examples/common/default/html.m4.html	Sun Apr 07 08:52:41 2019 +0900
@@ -6,7 +6,7 @@
 ifdef(`_S4COLOR_',
 `<meta name="theme-color" content="_S4COLOR_">',
 `<meta name="theme-color" content="#8ea">')
-<title>_TITLE_</title>
+<title>_TITLE_|ifdef(`_S4NAME_',_S4NAME,s4)</title>
 <link rel="stylesheet" type="text/css" href="templ/default/default.css">
 ifdef(`_S4CSS_',
 `<link rel="stylesheet" type="text/css" href="_S4CSS_">
diff -r 1f7d6999ed4c -r 2a48690b8cbc s4-funcs.sh
--- a/s4-funcs.sh	Sat Apr 06 21:34:53 2019 +0900
+++ b/s4-funcs.sh	Sun Apr 07 08:52:41 2019 +0900
@@ -383,8 +383,8 @@
   logend
 }
 _m4() {
-  #_S4NAME_=f,f,f
-  m4 ${_S4NAME_:+"-D_S4NAME_=${_S4NAME_}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@"
+  #S4NAME=f,f,f
+  m4 ${_S4NAME_:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} "$@"
 }
 ismember() {
   # $1=user, $2=group
@@ -1842,7 +1842,7 @@
 
   tf=$tmpd/title.$$ pf=$tmpd/profile.$$ bf=$tmpd/blogs.$$ sf=$tmpd/search.$$
   search_form "$search_form_args"	> $sf
-  echo "$gecos さん"			> $tf
+  printf "%s さん" "$gecos"		> $tf
   { echo "<div class=\"noprofimg\">"
     viewtable $formdir/user.def user $1
     echo "</div>"
diff -r 1f7d6999ed4c -r 2a48690b8cbc scripts/add-group-csv.sh
--- a/scripts/add-group-csv.sh	Sat Apr 06 21:34:53 2019 +0900
+++ b/scripts/add-group-csv.sh	Sun Apr 07 08:52:41 2019 +0900
@@ -21,6 +21,17 @@
 	.mode csv
 	CREATE TEMPORARY TABLE _gusers(gname, user, admin);
 	.import $target _gusers
-	REPLACE INTO grp SELECT * FROM _gusers;
-	REPLACE INTO grp_adm SELECT * FROM _gusers WHERE admin LIKE 'admin';
+	REPLACE INTO grp SELECT distinct gname FROM _gusers;
+
+	CREATE TEMPORARY TABLE _default_grp_attr(key, val);
+	INSERT INTO _default_grp_attr
+	VALUES ('tag', 'lecture'), ('mtime', datetime('now', 'localtime'));
+
+	REPLACE INTO grp_s
+	 SELECT gname, key, 'string', val, NULL
+	 FROM (SELECT distinct gname FROM _gusers)
+	      JOIN _default_grp_attr;
+	REPLACE INTO grp_mem SELECT gname, user FROM _gusers;
+	REPLACE INTO grp_adm SELECT gname, user
+	FROM _gusers WHERE admin LIKE 'admin';
 EOF