Mercurial > hgrepos > hgweb.cgi > s4
diff s4-blog.sh @ 508:944739c3ac5c
Continuous search available
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Wed, 13 Mar 2019 20:16:56 +0900 |
parents | 5119c19d15b5 |
children | d34b8f36501c |
line wrap: on
line diff
--- a/s4-blog.sh Wed Mar 06 14:15:53 2019 +0900 +++ b/s4-blog.sh Wed Mar 13 20:16:56 2019 +0900 @@ -827,23 +827,28 @@ kwd=`echo "$kwd"|htmlescape` owner=`getpar owner` owner=${owner:-$1} - echo "「$kwd」による検索結果" | html p + msg="" if [ -n "$owner" ]; then cond="where key='owner' and val='$owner'" + search_form_args="author=$owner" if isuser $owner; then - echo "(`linkhome $owner` さんの記録からの検索)" | html p + msg="(`linkhome $owner` さんの記録からの検索)" else linkhome $owner 1>&3 - echo "(`linkhome $owner` グループからの検索)" | html p + msg="(`linkhome $owner` グループからの検索)" fi elif { author=`getpar author`; test -n "$author"; }; then atptn=`sqlquotestr $author` #kc="$kc${kc:+ AND }author=$atptn" authcond="WHERE author=$atptn" + search_form_args="author=$author" if isuser $author; then - echo "(`linkhome $author` さんの書き込みからの検索)" | html p + msg="(`linkhome $author` さんの書き込みからの検索)" fi fi + search_form "$search_form_args" "$kwd" + echo "「$kwd」による検索結果" $search_form_args| html p + echo "$msg" | html p # article_s: id=article-id, key='text', val='TEXT' # article: id=article-id, blogid=blogkd # blog: id=blog-id, author=LeaderAuthor