improved tag caching, removed obsolete HTML unescaping

diff --git a/widgets.sh b/widgets.sh
index f6ab6074bb1ceb5e8facbe9515d6baaa3740f894..fc6818e206748cb2c933e409e35afc52b0c14bbe 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -10,28 +10,11 @@ w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 w_str_s="$(STRING "$SEARCH")"
 w_str_f="$(STRING "$FILTER")"
 
-w_ascii='
-  s-0-0-g; s-1-1-g; s-2-2-g; s-3-3-g; s-4-4-g; s-5-5-g;
-  s-6-6-g; s-7-7-g; s-8-8-g; s-9-9-g;
-  s-A-A-g; s-B-B-g; s-C-C-g; s-D-D-g; s-E-E-g; s-F-F-g;
-  s-G-G-g; s-H-H-g; s-I-I-g; s-J-J-g; s-K-K-g; s-L-L-g;
-  s-M-M-g; s-N-N-g; s-O-O-g; s-P-P-g; s-Q-Q-g; s-R-R-g;
-  s-S-S-g; s-T-T-g; s-U-U-g; s-V-V-g; s-W-W-g; s-X-X-g;
-  s-Y-Y-g; s-Z-Z-g;
-  s-a-a-g; s-b-b-g; s-c-c-g; s-d-d-g; s-e-e-g; s-f-f-g;
-  s-g-g-g; s-h-h-g; s-i-i-g; s-j-j-g; s-k-k-g; s-l-l-g;
-  s-m-m-g; s-n-n-g; s-o-o-g; s-p-p-g; s-q-q-g; s-r-r-g;
-  s-s-s-g; s-t-t-g; s-u-u-g; s-v-v-g; s-w-w-g; s-x-x-g;
-  s-y-y-g; s-z-z-g;
-  s---\--g; s-/-/-g; s-/-/-g; s-:-:-g; s-=-=-g; s-@-@-g;
-  s-_-_-g; s-~-~-g;              s- - -g; s-^-^-g; s-|-|-g;
-'
-
-w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache"
-if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
-   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags")" ]
+c_tags="$_DATA/.index/tags.cache"; c_tagcategories="$_DATA/.index/tagcategories.cache"
+if [ ! -s "$c_tags" -o ! -s "$c_tagcategories" ] \
+   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$c_tags")" ]
   then
-  w_tags="$( { local cn=1
+  w_tags="$( local cn=1
     find "$_DATA/" -path '*/.index/meta' -print0 \
     | xargs -r0 sed -r '
       s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
@@ -45,14 +28,16 @@ if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
         cn=1
       }
       otag="$tag"
-    done
-  } |sort -rn |cut -f2- |HTML |sed "$w_ascii s-
-\n-g; s;\n\n;\n;g;" |tee "$w_tags" )"
-  w_tagcategories="$(printf %s "$w_tags" \
-                     | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |sort -u \
-                     | tee "$w_tagcategories" )"
+    done \
+    |sort -rn |cut -f2- |HTML \
+    |sed "s-
-\n-g; s;\n\n;\n;g;"
+  )"
+  w_tagcategories="$(printf %s "$w_tags" | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |sort -u )"
+  printf %s "$w_tags" >"$c_tags"
+  printf %s "$w_tagcategories" >"$c_tagcategories"
 else
-  w_tags="$(cat "$w_tags")"
-  w_tagcategories="$(cat "$w_tagcategories")"
+  w_tags="$(cat "$c_tags")"
+  w_tagcategories="$(cat "$c_tagcategories")"
 fi
 
 
@@ -179,7 +164,7 @@ w_index(){
 
 w_advsearch(){
   local n lbid tag category filter f t d
-  filter="$(HTML "${FILTER}^" |sed "$w_ascii")"
+  filter="$(HTML "${FILTER}^")"
 
   printf '[form #advsearch action=./?a=advsearch method=POST
             [a href="#" Hide]