fix bug in exclusive tag support

[serve0] / multitag.sh

diff --git a/multitag.sh b/multitag.sh
index 0a8e9d4858d1e6d4e7c969251cb4f8bc36a6ce36..20b39391f9db1a9c103cda521c8ac145df334e33 100644 (file)
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,29 +1,49 @@
 #!/bin/sh
 
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/indexmeta.sh"
+
+newtags=''
+for tn in $(seq 1 $(POST_COUNT tag)); do
+  newtags="${newtags},$(POST tag $tn)"
+done
+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)"
+  file="$_DATA/$ITEM/$(POST select $select |PATH)"
   meta="${file%/*}/.index/meta"
-  fn="${file##*/}"
 
-  if LOCK "$meta"; then
-    grep -vF " $fn" "$meta" >"${meta}.tmp"
-    read length width height tags comment x <<-EOF
-       $(grep -F "     $fn" "$meta")
+  read -r length width height tags comment fn <<-EOF
+       $(meta_info "$file")
        EOF
-    tags="$(printf '%s' "${tags#tags=}" | tr , '\n')"
 
-    for tn in $(seq 1 $(POST_COUNT tag)); do
-      tags="$tags${BR}$(POST tag $tn |sed -r 's;\t;\\t;g; s;\r;;g;')"
+  if [ ! "$deltags" ]; then
+    extags="$(printf '%s' "$newtags" |tr , '\n' |grep -e "^-" |cut -d: -f1 )"
+    tags="$(UNSTRING "${tags#tags=}" |tr , '\n' |grep -vwFe "$extags")"
+    if printf %s "$extags" |grep -vq :; then
+      tags="$(printf %s\\n "$tags" |grep -vE '^-[^:]+$')"
+    fi
+    tags="$(printf '%s\n' "${tags},${newtags}" \
+            | tr , '\n' |sort -u |tr '\n' , \
+            | STRING)"
+  else
+    tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
+    detag="${deltags},"; while [ "$detag" ]; do
+      tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%,*}")"
+      detag="${detag#*,}"
     done
-    tags="$tags${BR}$(POST newtag |sed -r 's;\t;\\t;g; s;\r;;g;')"
+    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' , |STRING)"
+  fi
+  tags="${tags#,}"; tags="${tags%,}"
+
+  if LOCK "$meta"; then
+    grep -avF "        $fn" "$meta" >"${meta}.tmp"
 
-    printf '%i\t%i\t%i\ttags=%s\t%s\t%s\n' \
-           "$length" "$width" "$height" \
-           "$(printf %s "$tags" |sort -u |tr '\n' ,)" \
-           "$comment" "$fn" \
-    >>"${meta}.tmp"
+    printf '%i %i      %i      tags=%s comment=%s      %s\n' \
+           "$length" "$width" "$height" "$tags" \
+           "${comment#comment=}" "$fn" \
+      >>"${meta}.tmp"
     mv "${meta}.tmp" "$meta"
 
     RELEASE "$meta"