# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1438953028 -32400
# Node ID 42234d2d6e9c94184a7bcfcc1cf5c63399df3215
# Parent  c17964aa7715cb737dcfb167c3250e481e85f7a4
Add Full-Range search

diff -r c17964aa7715 -r 42234d2d6e9c s4-blog.sh
--- a/s4-blog.sh	Fri Aug 07 21:42:06 2015 +0900
+++ b/s4-blog.sh	Fri Aug 07 22:10:28 2015 +0900
@@ -395,7 +395,7 @@
   cond="where a.id in (select id from blog_s where key='owner' and val=$qow) order by ctime desc"
   DT_CHLD=article:blogid
   cgi_form searchart<<EOF
-<label>`cgi_text kwd`という語を含む記事を検索</label>
+<label>`cgi_text kwd`という語を含む記事をこの一覧から検索</label>
 `cgi_hidden owner $user`
 EOF
   dumptable html blog 'ctime title heading' "$cond"
diff -r c17964aa7715 -r 42234d2d6e9c s4-funcs.sh
--- a/s4-funcs.sh	Fri Aug 07 21:42:06 2015 +0900
+++ b/s4-funcs.sh	Fri Aug 07 22:10:28 2015 +0900
@@ -1374,8 +1374,20 @@
       echo "全体の新着記事${cont}傑" | html h2
       echo "$new10"
     fi
+    cat<<EOF
+<div class="fold">
+`cgi_checkbox srchall yes id="sa"`<label
+ for="sa">SNS全体から検索</label>
+<div>
+EOF
+    cgi_form searchart<<EOF
+<label>`cgi_text kwd`という語を含む記事を全部から検索</label>
+EOF
+    cat<<EOF
+</div></div>
+EOF
   fi
-  #  
+  #
   # Record access log
   [ -n "$1" ] && [ x"$1" != x"$user" ] && acclog user $1
 }