# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1438352468 -32400
# Node ID 3a157da0801d6d6c050acfa5fde3a0d964eb0595
# Parent  7882917ecd330402d0a7687835c55790b682ff81
cache name fixed

diff -r 7882917ecd33 -r 3a157da0801d s4-funcs.sh
--- a/s4-funcs.sh	Fri Jul 31 16:44:30 2015 +0900
+++ b/s4-funcs.sh	Fri Jul 31 23:21:08 2015 +0900
@@ -328,7 +328,7 @@
   # $1=id|gname
   sql="select coalesce((select gname from grp where gname=$(sqlquote $1)),
 	(select gname from grp where rowid=$(sqlquote $1)));"
-err ggbyid: `echo $sql`
+  # err ggbyid: `echo $sql`
   query $sql
 }
 isfilereadable() { # $1=user $2=tbl $3=rowid
@@ -2019,7 +2019,7 @@
 <input name="confirm" type=checkbox value="yes">はい</span>'
   fi
   # Image Cache dir
-  td=`getcachedir $2`
+  td=`getcachedir $2$3`
   while IFS=: read prompt name keytype type args; do
     [ -z "${prompt%%\#*}" ] && continue # skip comment line(#)
     sp="${args:+ }"
@@ -2197,7 +2197,8 @@
 		  $layout/html.m4.html $layout/form+dump.m4.html
 }
 showattc() {
-  # $1=table_m $2=rowid $3=val
+  # $1=table_m $2=rowid
+  err \$1=$1 \$2=$2
   if ! isfilereadable $user $1 $2; then
     contenttype; echo
     echo "このファイルは管理者のみしか見られません" | html p