X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=handlers%2F40_search.sh;h=57117e3834a1bbe0c816f92e785bc38c188bc186;hb=6d62de4f9aa16fb129513fa38c60158bfde36f16;hp=90840603cd6ec7e1881b197f92994d2bbd4e3882;hpb=65b04e000d563f2347370cbf3e1e01cf2af0a168;p=shellwiki

diff --git a/handlers/40_search.sh b/handlers/40_search.sh
index 9084060..57117e3 100644
--- a/handlers/40_search.sh
+++ b/handlers/40_search.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2023 Paul Hänsch
+# Copyright 2023, 2024 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
@@ -18,26 +18,92 @@
 [ "${PATH_INFO%\[search\]}" = "$PATH_INFO" ] && return 1
 
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/cgilite/db23.sh"
 
 I="$_DATA/index"
+tags="$( 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]')"')+";
+          else                     # UTF-8 Hack
+          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++) if ($n ~ /#[[:alnum:]_]+/) {
+      sub(/^#/,"",$n)
+      printf "%s	", toupper($n);
+    }
+  }
+')"
+
+ntags="$( 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]')"')+";
+          else                     # UTF-8 Hack
+          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++) if ($n ~ /![[:alnum:]_]+/) {
+      sub(/^!/,"",$n)
+      printf "%s	", toupper($n);
+    }
+  }
+')"
+
 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	", tolower($n); }
+  { for (n = 1; n <= NF; n++) if ($n !~ /![[:alnum:]_]+/) {
+      sub(/!/," ",$n)
+      printf "%s	", tolower($n);
+    }
+  }
 ')"
 
+searchteaser() {
+  local file="$1" words db3_data
+  local w l nc nl hits mhits cont mcont
+  shift 1; words="$*"
+
+  for w in ${words}; do
+    grep -hiwnF "$w" "$file"
+  done \
+  | sort -t: -k1 -n \
+  | { nc=-1 hits=0 mhits=0
+    while read -r l; do
+      nl="$nc" nc="${l%%:*}"
+      if [ $nc -eq $nl ]; then
+        hits=$((hits + 1))
+      elif [ $nc -eq $((nl + 1 )) ]; then
+        hits=$((hits + 1))
+        cont="${cont}${BR}${l#*:}"
+      elif [ $hits -gt $mhits ]; then
+        mhits="$hits" mcont="$cont"
+        hits=1 cont="${l#*:}"
+      else
+        hits=1 cont="${l#*:}"
+      fi
+    done
+
+    [ $hits -gt $mhits ] \
+    && STRING "$cont" \
+    || STRING "$mcont"
+  }
+}
+
 for w in ${words}; do
   [ ! -f "$I/$w" ] && continue
 
   while read date doc freq num total; do
     P="$_DATA/pages$(UNSTRING "$doc")"
     d="$(stat -c %Y -- "$P/#index.flag" 2>&-)"
-    [ "$d" -le "$date" ] 2>&- || continue
+    [ "$d" -le "$date" -a -f "$P/#page.md" ] 2>&- || continue
 
     printf '%s	%f\n' "$doc" "$freq"
   done <"$I/$w"
@@ -57,6 +123,8 @@ done \
     [ "${page%/:*/}" = "${page%/:${LANGUAGE}/}" ] || continue
   fi
   acl_read "$page" || continue
-  printf '%s\n' "$page"
+  has_tags "$page" $tags || continue
+  has_tag "$page" $ntags && continue
+  printf '%s	%s\n' "$doc" "$(searchteaser "$(mdfile "$page")" $words)"
 done \
 | theme_search "${words%	}"