bugfix: prevent accidental index invalidation by getting doc path from pwd instead...

[shellwiki] / parsers / 40_indexer.sh

diff --git a/parsers/40_indexer.sh b/parsers/40_indexer.sh
index d5783f4ea9c8e79cb78dbf706ab75888ec0fd78f..d25aacfb82179c426abde0c4baea849e534e9090 100755 (executable)
--- a/parsers/40_indexer.sh
+++ b/parsers/40_indexer.sh
@@ -14,10 +14,11 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
 # IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-DOC="${PATH_INFO%/}/" DOC="${DOC%/\[*\]/}" DOC="${DOC%/}/"
-P="$_DATA/pages${DOC}" I="$_DATA/index/"
+P="$PWD" I="$_DATA/index/" _DATE=$((_DATE + 1))
 
-if [ -f "$P/#index.flag" -a ! "$P/#page.md" -nt "$P/#index.flag" ]; then
+if [ "$SEARCH_INDEX" != true ] || [ ! -d "$P" ] || \
+   [ -f "$P/#index.flag" -a ! "$P/#index.flag" -ot "$P/#page.md" ]
+then
   cat
   exit 0
 fi
@@ -26,8 +27,9 @@ fi
 
 exec 3>&1
 
-touch "$P/#index.flag"
+touch -d "@$_DATE" "$P/#index.flag"
 mkdir -p "$I"
+DOC="$(STRING "${P#"$_DATA/pages"}")"
 
 { cat; printf \\n; } \
 | while IFS='' read -r line; do
@@ -35,26 +37,22 @@ mkdir -p "$I"
   printf '%s\n' "$line"
 done \
 | awk '
-  BEGIN { FS = "[] \t\n\r!\"#'\''()*+,./:;<=>?\\^_`{|}~[-]+" }
-        { for (n = 1; n <= NF; n++) if ( $n != "" ) { words[tolower($n)]++; total++; } }
+  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 != "" && length($n) <= 128 ) {
+              words[tolower($n)]++; total++;
+        } } }
     END { for (w in words) printf "%i %i %f %s\n", words[w], total, words[w] / total, w; }
 ' \
-| while read num total freq word; do
+| while read -r num total freq word; do
   [ "$word" ] || continue
-  F="$I/$word"
-  L="$(STRING "$DOC")"
-
-  if LOCK "$F"; then
-    touch "$F"
-    { while read d l f n t; do
-      [ "$l" = "$L" ] \
-      || printf "%i    %s      %f      %i      %i\n" \
-                "$d" "$l" "$f" "$n" "$t"
-      done <"$F"
-      printf "%i       %s      %f      %i      %i\n" \
-             "$_DATE" "$L" "$freq" "$num" "$total"
-    } >"$F.$$"
-    mv -- "$F.$$" "$F"
-    RELEASE "$F"
-  fi
+  printf "%i   %s      %f      %i      %i\n" \
+         "$_DATE" "$DOC" "$freq" "$num" "$total" \
+  >>"$I/$word"
 done