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

diff --git a/handlers/40_search.sh b/handlers/40_search.sh
index c9bc627..5d0b1f6 100644
--- a/handlers/40_search.sh
+++ b/handlers/40_search.sh
@@ -1,5 +1,19 @@
 #!/bin/sh
 
+# Copyright 2023 Paul Hänsch
+# 
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+# 
+# THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+# IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 [ "${PATH_INFO%\[search\]}" = "$PATH_INFO" ] && return 1
 
 . "$_EXEC/cgilite/storage.sh"
@@ -8,12 +22,12 @@ I="$_DATA/index"
 words="$( GET q | awk '
   BEGIN { # Field separator FS should include punctuation, including Unicode Block U+2000 - U+206F
           if ( length("¡") == 1 )  # Utf-8 aware AWK
-          FS = "([] \t\n\r!\"#'\''()*+,./:;<=>?\\^_`{|}~[-]|%[0-9A-Fa-f]{2}|'"$(printf '[\342\200\200-\342\201\257]')"')+";
+          FS = "([] \\t\\n\\r!\"#'\''()*+,./:;<=>?\\\\^_`{|}~[-]|%[0-9A-Fa-f]{2}|'"$(printf '[\342\200\200-\342\201\257]')"')+";
           else                     # UTF-8 Hack
-          FS = "([] \t\n\r!\"#'\''()*+,./:;<=>?\\^_`{|}~[-]|%[0-9A-Fa-f]{2}|'"$(printf '\342\200[\200-\277]|\342\201[\201-\257]')"')+";
+          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 +50,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%	}"