X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=896ca6cdfab3d97ebdcfd59374221f618100a336;hb=16ee00076365ddf4a1b85396c6673f2adbf215e8;hp=2736f66f52f4fc0a5c96ec883bcac64ede3fec8d;hpb=a383b5e7023bf2961354f5ec26d4061bc9993e98;p=serve0

diff --git a/widgets.sh b/widgets.sh
index 2736f66..896ca6c 100644
--- a/widgets.sh
+++ b/widgets.sh
@@ -45,7 +45,7 @@ if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
     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" \
-                     | cut -sd: -f1 |sort -u \
+                     | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |sort -u \
                      | tee "$w_tagcategories" )"
 else
   w_tags="$(cat "$w_tags")"
@@ -162,7 +162,7 @@ w_index(){
 }
 
 w_advsearch(){
-  local n lbid tag category filter f t
+  local n lbid tag category filter f t d
   filter="$(HTML "${FILTER}^" |sed "$w_ascii")"
 
   printf '[form #advsearch action=?a=advsearch method=POST
@@ -193,6 +193,7 @@ w_advsearch(){
       t=''
       [ "$category"  = '*' -a   "${f%%|${category}:*}" ] && t=checked
       [ "$category" != '*' -a ! "${f%%|${category}:*}" ] && t=checked
+      [ "$category" != '*' -a ! "${f%%|-${category}:*}" ] && t=checked
 
       printf '[radio "cat_%i" "%s" .cat %s id="%s"][label for="%s" %s]
               [select name=tag_%s size=10 multiple' \
@@ -202,12 +203,13 @@ w_advsearch(){
       | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
       | { for n in 1 2 3 4 5 6 7 8 9 0; do
           read -r line && printf '%s\n' "$line" || break;
-          done;  # path 10 lines through without modification
+          done;  # pass 10 lines through without modification
           sort;  # and sort remaining lines
       } | while read -r tag; do
         [ "$tag" ] || continue
         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
-        printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
+        d="${tag#-}"; d="${d#*:}"
+        printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d"
       done
       printf '\n]'
     done
@@ -227,7 +229,7 @@ w_advsearch(){
 }
 
 w_tagging(){
-  local tag category
+  local tag category d
   printf '[a href="#multitag" Add Tags / Remove Tags]
           [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
@@ -244,7 +246,8 @@ w_tagging(){
         sort;
     } | while read -r tag; do
       [ "$tag" ] || continue
-      printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
+      d="${tag#-}"; d="${d#*:}"
+      printf '[option value="%s"\n%s]' "$tag" "$d"
     done
     printf ']]'
   done