allow tag removal in multitagger

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index f64930661445622732d23b372caaa082a8ce7ea1..916f1d755433db26ebe0a8a119186f14ac09651e 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -26,7 +26,7 @@ w_ascii='
 
 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" -quit)" ]
+   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags")" ]
   then
   w_tags="$( { local cn=1
     find "$_DATA/" -path '*/.index/meta' -print0 \
@@ -147,7 +147,7 @@ w_prefs(){
 }
 
 w_index(){
-  [ -d "$_DATA/$ITEM/.index" ] || printf '
+  printf '
   [form #index method="POST" action="?a=spawnindex"
     [hidden "ref" "%s"]
     [label Set up for Index view: ]
@@ -155,6 +155,7 @@ w_index(){
     [submit "spawn" "spawn" Set up]
   ]
   ' "$w_refuri"
+  return 0
 }
 
 w_advsearch(){
@@ -196,8 +197,11 @@ w_advsearch(){
 
       printf '%s\n' "$w_tags" \
       | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
-      | { for n in 1 2 3 4 5 6 7 8 9 0; do line || break; done; sort; } \
-      | while read -r tag; do
+      | { 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
+          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#*:}"
@@ -221,21 +225,28 @@ w_advsearch(){
 
 w_tagging(){
   local tag category
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
+  printf '[a href="#multitag" Add Tags / Remove Tags]
+          [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
 
   printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
+    [ "$category" ] || continue
+    printf '[fieldset [legend %s:][select name=tag size=4 multiple\n' "$category"
     printf %s "$w_tags" \
     | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \
-    | { for n in 1 2 3 4 5 6 7 8 9 0; do line || break; done; sort; } \
-    | while read -r tag; do
+    | { for n in 1 2 3 4 5 6 7 8 9 0; do
+        read -r line && printf '%s\n' "$line" || break
+        done;
+        sort;
+    } | while read -r tag; do
       [ "$tag" ] || continue
       printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done
     printf ']]'
   done
 
-  printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]'
+  printf '[fieldset [legend New:][textarea name=newtag\n]
+          [submit "op" "del" Remove Tags][submit "op" "add" Add Tags]
+          ]]'
 }