allow tag removal in multitagger

diff --git a/multitag.sh b/multitag.sh
index 45798069f237adfab581e7bcbe7b9034de3168d2..8b60adebb1ac8e265866f00570c47d124c0ca9e3 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -7,7 +7,8 @@ newtags=''
 for tn in $(seq 1 $(POST_COUNT tag)); do
   newtags="${newtags},$(POST tag $tn)"
 done
-newtags="${newtags},$(POST newtag |tr -d '\r')"
+newtags="${newtags},$(POST newtag |tr -d '\r' |tr '\n' ,)"
+[ "$(POST op)" = del ] && deltags="$newtags"
 
 for select in $(seq 1 $(POST_COUNT select)); do
   file="$_DATA/$ITEM/$(POST select $select |PATH)"
@@ -16,9 +17,19 @@ for select in $(seq 1 $(POST_COUNT select)); do
   read -r length width height tags comment fn <<-EOF
        $(meta_info "$file")
        EOF
-
-  tags="$(UNSTRING "${tags#tags=}")"
-  tags="$(printf '%s\n' "${tags}" "${newtags}" |tr , '\n' |sort -u |tr '\n' , |STRING)"
+  tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
+
+  if [ ! "$deltags" ]; then
+    tags="$(printf '%s\n' "${tags},${newtags}" \
+            | tr , '\n' |sort -u |tr '\n' , \
+            | STRING)"
+  else
+    detag="${deltags},"; while [ "$detag" ]; do
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
+      detag="${detag#*,}"
+    done
+    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' , |STRING)"
+  fi
   tags="${tags#,}"; tags="${tags%,}"
 
   if LOCK "$meta"; then

diff --git a/widgets.sh b/widgets.sh
index ab09899d64dd64a604b67b760636f7af32240a8f..916f1d755433db26ebe0a8a119186f14ac09651e 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -225,7 +225,7 @@ w_advsearch(){
 
 w_tagging(){
   local tag category
-  printf '[a href="#multitag" Add Tags]
+  printf '[a href="#multitag" Add Tags / Remove Tags]
           [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
 
@@ -246,5 +246,7 @@ w_tagging(){
     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]
+          ]]'
 }