X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=handlers%2F40_search.sh;h=d198f220756319f457783e95af36d43d9114351e;hb=35c700335c55a0819e3582a77211e3cb280f48fe;hp=c9bc62738c985f8db46b8a4326f5eac018c08613;hpb=e16cbbded1805c1cd2256b7679bd299dc4746579;p=shellwiki

diff --git a/handlers/40_search.sh b/handlers/40_search.sh
index c9bc627..d198f22 100644
--- a/handlers/40_search.sh
+++ b/handlers/40_search.sh
@@ -13,7 +13,7 @@ words="$( GET q | awk '
           FS = "([] \t\n\r!\"#'\''()*+,./:;<=>?\\^_`{|}~[-]|%[0-9A-Fa-f]{2}|'"$(printf '\342\200[\200-\277]|\342\201[\201-\257]')"')+";
           fi
         }
-	{ for (n = 1; n <= NF; n++) printf "%s	", $n; }
+	{ for (n = 1; n <= NF; n++) printf "%s	", tolower($n); }
 ')"
 
 for w in ${words}; do
@@ -36,14 +36,12 @@ done \
 | sort -nr \
 | while read freq doc; do
   page="$(UNSTRING "$doc")"
+  [ "${page%*/\[*\]/*}" != "$page" ] && continue
+  if [ "$LANGUAGE_DEFAULT" ]; then
+    [ -d "${_DATA}/pages/${page}/:${LANGUAGE}/" ] && continue
+    [ "${page%/:*/}" = "${page%/:${LANGUAGE}/}" ] || continue
+  fi
   acl_read "$page" || continue
-  printf '<li><a href="%s">%s</a></li>' "$(URL "$page")" "$(HTML "$page")"
+  printf '%s\n' "$page"
 done \
-| theme_page - <<-EOF
-	<article>
-	  <h1>$(_ "Search results:")</h1>
-	  <ol class="searchresults">
-	    $(cat)
-	  </ol>
-	</article>
-	EOF
+| theme_search "${words%	}"