s4
diff s4-funcs.sh @ 836:b3516ee2bb4d
Filename renaming added to article EDIT
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Tue, 23 Jun 2020 12:58:31 +0900 |
parents | f3d422665ea8 |
children | a6462eea48be |
line diff
1.1 --- a/s4-funcs.sh Mon Jun 22 18:53:43 2020 +0900 1.2 +++ b/s4-funcs.sh Tue Jun 23 12:58:31 2020 +0900 1.3 @@ -729,7 +729,7 @@ 1.4 user|skey) unset _$i ;; 1.5 esac 1.6 fi 1.7 - query "DELETE FROM par WHERE var='$i';" 1.8 + query "DELETE FROM par WHERE var='$i' AND sessid='$session';" 1.9 done 1.10 } 1.11 replpar() { 1.12 @@ -2941,7 +2941,7 @@ 1.13 fi 1.14 subj=`getpar subject` 1.15 afiles="" 1.16 - for fn in `query "SELECT DISTINCT val FROM par WHERE var='files';"` 1.17 + for fn in `query "SELECT DISTINCT val FROM par WHERE var='files' AND sessid='$session';"` 1.18 do 1.19 f=$tmpd/$fn 1.20 if [ -s $f ]; then 1.21 @@ -3978,7 +3978,7 @@ 1.22 # sessID|address.1.22|string|Somewhere-x.y.z 1.23 sql="" 1.24 ##err dots from query "select var from par where var like '$col.%';" 1.25 - for v in `query "select var from par where var like '$col.%';"`; do 1.26 + for v in `query "select var from par where var like '$col.%' AND sessid='$session';"`; do 1.27 # v=address.1.22 1.28 st_rowid=${v##*.} 1.29 origcol=${v%%.*} # original column derived from 1.30 @@ -4014,10 +4014,29 @@ 1.31 ;; 1.32 *) 1.33 newsql="update $tb2 set val=(select val from par where var \ 1.34 -like '$col.%.$st_rowid')" 1.35 +like '$col.%.$st_rowid' AND sessid='$session')" 1.36 ;; 1.37 esac 1.38 ;; 1.39 + mv) 1.40 + # regularize filename and strip directory part 1.41 + newname=`getpar mv.$v|tr -d '":;#<>?^%$!'|tr -d "'"|tr ' ' _` 1.42 + newname=`basename $newname` 1.43 + err "newname($v)=$newname" 1.44 + newext="${newname##*.}" 1.45 + if test x"$newname" != x"$newext" \ 1.46 + && echo "${file_accept#*=}" \ 1.47 + | fgrep -w "$newext" >/dev/null 1>&2 1.48 + then 1.49 + newsql="UPDATE $tb2 SET val='$newname'" 1.50 + else 1.51 + html p<<-EOF 1.52 + $newname は取り扱えないファイル名です。 1.53 + 空白を含まない名前で拡張子を正しくつけて下さい。 1.54 + EOF 1.55 + continue 1.56 + fi 1.57 + ;; 1.58 *) # maybe "keep", do not modify value 1.59 continue 1.60 ;;