# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1438354129 -32400
# Node ID 5e95c17f6b78827d129ce21eba6234ed8d3cbe4c
# Parent  ab37fa69e06435baebb0ff93c1a01b9607db91fd
variable separation

diff -r ab37fa69e064 -r 5e95c17f6b78 s4-funcs.sh
--- a/s4-funcs.sh	Fri Jul 31 23:36:11 2015 +0900
+++ b/s4-funcs.sh	Fri Jul 31 23:48:49 2015 +0900
@@ -1853,9 +1853,9 @@
 err dots from query "select var from par where var like '$col.%';"
 	 for v in `query "select var from par where var like '$col.%';"`; do
 	   # v=address.1.22
-	   rowid=${v##*.}
+	   st_rowid=${v##*.}
 	   origcol=${v%%.*}	# original column derived from
-err Updating for $v rowid=$rowid, partype=`getpartype $v`
+err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v`
 	   ##case `getpartype $v` in
 	   err CASE `gettbl_coltype $tbl/$origcol` in
 	   err edit flag = `getpar action.$v`
@@ -1877,13 +1877,13 @@
 		   ct=`file --mime-type $file|cut -d' ' -f2`
 		   type=\"file:$ct\"
 		   newsql="update $tb2 set val='$bn', type=$type, bin=$bin"
-		   cachedir=`getcachedir "$tb/$rowid"`
-		   err rm -r $cachedir
+		   cachedir=`getcachedir "$tbl/$rowid"`
+		   err getcache tbl/rowid=$tbl/$rowid, rm -r $cachedir
 		   rm -r $cachedir
 		   ;;
 		 *)
 		   newsql="update $tb2 set val=(select val from par where var \
-like '$col.%.$rowid')"
+like '$col.%.$st_rowid')"
 		   ;;
 	       esac
 	       ;;
@@ -1892,7 +1892,7 @@
 	       ;;
 	   esac
 # err newsql=$newsql
-	   sql=$sql$nl"$newsql where rowid=$rowid;"
+	   sql=$sql$nl"$newsql where rowid=$st_rowid;"
 	 done
 	 echo "$sql
 delete from $tb2 where type='string' and val='';" | sq $db