Mercurial > hgrepos > hgweb.cgi > s4
diff s4-blog.sh @ 375:b971fa6ebcb1
Do not call lshandoutsub if $SQL set(gethandoutcsv2)
| author | HIROSE Yuuji <yuuji@gentei.org> |
|---|---|
| date | Sun, 27 Nov 2016 15:53:16 +0859 |
| parents | 59e31510f574 |
| children | 1f62c51bed4f |
line wrap: on
line diff
--- a/s4-blog.sh Sun Nov 27 15:19:00 2016 +0859 +++ b/s4-blog.sh Sun Nov 27 15:53:16 2016 +0859 @@ -389,7 +389,6 @@ WHERE owner=$qowner AND mode LIKE '%report%'; /* ↑これでレポート形式の blogid 一覧を得る */ EOF - bridlist=`query "SELECT brid FROM report_type_blogs;"` if [ -z "$CATCSV" ]; then _m4 -D_TITLE_="提出状況" $layout/html.m4.html ge=`gecos "$owner"` @@ -397,20 +396,23 @@ grptxt=`echo "${ge:-$owner}"|htmlescape` echo "<h1>$grptxt 書き込み状況一覧</h1>" fi - for brid in $bridlist; do - brid=$(($brid + 0)) # Ensure to be a number - [ $brid = 0 ] && continue - time=`getvalbyid blog ctime $brid|colrm 11` - title=`getvalbyid blog title $brid|htmlescape` - tt="handout_$brid" - if [ -z "$CATCSV" ]; then - echo "<h2>$time - <a href=\"?replyblog+$brid\">$title</a></h2>" - lshandoutsub "$owner" $brid "$tt" - else - lshandoutsub "$owner" $brid "$tt" >/dev/null # Only create temp.table - fi - tbls="$tbls${tbls:+ NATURAL JOIN }$tt" - done + if [ -z "$SQL" ]; then + bridlist=`query "SELECT brid FROM report_type_blogs;"` + for brid in $bridlist; do # Skip this loop if $SQL set + brid=$(($brid + 0)) # Ensure to be a number + [ $brid = 0 ] && continue + time=`getvalbyid blog ctime $brid|colrm 11` + title=`getvalbyid blog title $brid|htmlescape` + tt="handout_$brid" + if [ -z "$CATCSV" ]; then + echo "<h2>$time - <a href=\"?replyblog+$brid\">$title</a></h2>" + lshandoutsub "$owner" $brid "$tt" + else + lshandoutsub "$owner" $brid "$tt" >/dev/null # Only create temp.table + fi + tbls="$tbls${tbls:+ NATURAL JOIN }$tt" + done + fi sql=${SQL:-"SELECT * FROM $tbls;"} if [ -z "$CATCSV" ]; then echo "<hr><h2>総合</h2>"
