s4
changeset 647:a8a5e6437f1a
Fix for member listing in group home
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Fri, 08 May 2020 17:08:49 +0900 |
| parents | d9bce34a863b |
| children | 8ec02e0fd1d5 |
| files | s4-funcs.sh |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line diff
1.1 --- a/s4-funcs.sh Thu May 07 23:03:33 2020 +0900 1.2 +++ b/s4-funcs.sh Fri May 08 17:08:49 2020 +0900 1.3 @@ -2216,11 +2216,9 @@ 1.4 qtag=`sqlquote "$tag"` 1.5 cond2="tag=$qtag" 1.6 fi 1.7 - if [ -n "$cond1$cond2$3" ]; then 1.8 - cond="$cond1${cond2:+ AND $cond2}${3:+ AND ($3)}" 1.9 - cond=${cond# AND } 1.10 - cond=${cond% AND } 1.11 - cond=${cond:+WHERE $cond} 1.12 + if [ -n "$cond1$cond2" ]; then 1.13 + cond="$cond1${cond2:+ AND $cond2}" 1.14 + cond="WHERE ${cond# AND }" 1.15 fi 1.16 1.17 # XX: これ複雑すぎるかな。もっとシンプルにしたい。$3条件も。2015-07-08 1.18 @@ -2269,7 +2267,7 @@ 1.19 max(case key when 'wtime' then val end) as wtime, 1.20 max(case key when 'login' then val end) as login 1.21 from ${tbl}_s group by $nm) 1.22 - b on a.$nm=b.name $cond /* $3 */ 1.23 + b on a.$nm=b.name $cond $3 1.24 order by b.wtime desc, b.login desc, 1.25 b.mtime desc, b.tag desc, a.rowid asc" 1.26 # Give precedence to newer maintained groups (2016-09-24)