--- a/s4-world.sh	Sun Jun 21 16:13:52 2020 +0900
+++ b/s4-world.sh	Sun Jun 21 16:44:11 2020 +0900
@@ -182,24 +182,27 @@
   done
 }
 
-grepgrpworld() (
-  world=$1; wname=$2; exp=$3; db=$4
+grepgrpworld() {
+  world=$1; wname=$2; exp=$3; tdb=$4
   case $world in
     Base)	cgi=${S4MASTERURL:-$URL} ;;
     *)		cgi=s4-world-$world$cgiext ;;
   esac
-  arg=${3#*:}
   case $exp in
-    kwd:*) cond="gname LIKE '%$arg%'"
-	   guide="`echo $arg|htmlescape` を含むグループは別世界にもあります"
-	   s="(<a href=\"$cgi?stage=grps&kwd=$arg\">絞込</a>)" ;;
-    mem:*) cond="user = '$arg'"
-	   guide="別世界の所属グループ"
-	   s="(<a href=\"$cgi?stage=grps&kwd=mem:$arg\">所属絞</a>)" ;;
+    mem:*)
+      arg=${exp#*:}
+      cond="user = '$arg'"
+      guide="「${S4WORLDNAME:-Base}」以外の世界の所属グループ"
+      s="(<a href=\"$cgi?stage=grps&kwd=mem:$arg\">所属絞</a>)" ;;
+    *)
+      arg=`sqlquote "%$3%"`
+      cond="gname LIKE $arg"
+      guide="$exp を含むグループは別世界にもあります"
+      s="(<a href=\"$cgi?stage=grps&kwd=$exp\">絞込</a>)" ;;
   esac
   err "arg=[$arg] cond=[$cond] s=[$s]"
   query <<-EOF |
-	ATTACH DATABASE "$db" AS td;
+	ATTACH DATABASE "$tdb" AS td;
 	SELECT DISTINCT td.grp.rowid,hex(gname)
 	FROM td.grp NATURAL JOIN td.grp_mem
 	WHERE $cond;
@@ -215,6 +218,7 @@
       w=`echo $wname|htmlescape`
       u="<a href=\"$cgi?grps\"><span class=\"pre\">$w</span></a>"
       cat<<-EOF
+	GUIDE:<h2>`echo "$guide"|htmlescape`</h2>
 	<tr>
 	 <tr><td>$u $s</td>
 	 <td>$ans</td>
@@ -222,10 +226,11 @@
 	EOF
     fi
   }
-)
+}
 
 peekgrpworlds() (
-  # $1=(kwd:Pattern|mem:User)
+  # $1=(Pattern|mem:User)
+  # err "pgw-1=[$1]"
   for wd in `worldnameDBlist`; do
     world=${wd%%:*}; wd=${wd#*:}
     worldname=${wd%:*}
@@ -236,8 +241,12 @@
   done | {
     result=`cat`
     if [ -n "$result" ]; then
-      echo "<h2>$guide</h2>"
-      echo "<table class=\"b\">$nl $result$nl</table>"
+      cat<<-EOF
+	`echo "$result"|sed 's/^GUIDE://;2q'`
+	<table class="b">
+	 `echo "$result"|grep -v '^GUIDE:'`
+	</table>
+	EOF
     fi
   }
 )