s4

changeset 75:5e95c17f6b78

variable separation
author HIROSE Yuuji <yuuji@gentei.org>
date Fri, 31 Jul 2015 23:48:49 +0900
parents ab37fa69e064
children 63d6f7829231
files s4-funcs.sh
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Fri Jul 31 23:36:11 2015 +0900
     1.2 +++ b/s4-funcs.sh	Fri Jul 31 23:48:49 2015 +0900
     1.3 @@ -1853,9 +1853,9 @@
     1.4  err dots from query "select var from par where var like '$col.%';"
     1.5  	 for v in `query "select var from par where var like '$col.%';"`; do
     1.6  	   # v=address.1.22
     1.7 -	   rowid=${v##*.}
     1.8 +	   st_rowid=${v##*.}
     1.9  	   origcol=${v%%.*}	# original column derived from
    1.10 -err Updating for $v rowid=$rowid, partype=`getpartype $v`
    1.11 +err Updating for $v st_rowid=$st_rowid, partype=`getpartype $v`
    1.12  	   ##case `getpartype $v` in
    1.13  	   err CASE `gettbl_coltype $tbl/$origcol` in
    1.14  	   err edit flag = `getpar action.$v`
    1.15 @@ -1877,13 +1877,13 @@
    1.16  		   ct=`file --mime-type $file|cut -d' ' -f2`
    1.17  		   type=\"file:$ct\"
    1.18  		   newsql="update $tb2 set val='$bn', type=$type, bin=$bin"
    1.19 -		   cachedir=`getcachedir "$tb/$rowid"`
    1.20 -		   err rm -r $cachedir
    1.21 +		   cachedir=`getcachedir "$tbl/$rowid"`
    1.22 +		   err getcache tbl/rowid=$tbl/$rowid, rm -r $cachedir
    1.23  		   rm -r $cachedir
    1.24  		   ;;
    1.25  		 *)
    1.26  		   newsql="update $tb2 set val=(select val from par where var \
    1.27 -like '$col.%.$rowid')"
    1.28 +like '$col.%.$st_rowid')"
    1.29  		   ;;
    1.30  	       esac
    1.31  	       ;;
    1.32 @@ -1892,7 +1892,7 @@
    1.33  	       ;;
    1.34  	   esac
    1.35  # err newsql=$newsql
    1.36 -	   sql=$sql$nl"$newsql where rowid=$rowid;"
    1.37 +	   sql=$sql$nl"$newsql where rowid=$st_rowid;"
    1.38  	 done
    1.39  	 echo "$sql
    1.40  delete from $tb2 where type='string' and val='';" | sq $db