X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=multitag.sh;h=12117cdf86ea852b7ea430a5aedd00c9f8eb4969;hb=5265f0fb5c0b960a89be7fcd9c9e7cc12d1bcde4;hp=353ead6dbf838d331d25c45a24ce41a2a34d181c;hpb=67ad091277e6173dca4f446de4d1cc4fd0285610;p=serve0

diff --git a/multitag.sh b/multitag.sh
old mode 100644
new mode 100755
index 353ead6..12117cd
--- a/multitag.sh
+++ b/multitag.sh
@@ -1,13 +1,18 @@
 #!/bin/sh
 
-. "$_EXEC/cgilite/storage.sh"
-. "$_EXEC/indexmeta.sh"
+. "$_EXEC/db_meta.sh"
+. "$_EXEC/cgilite/session.sh" nocookie
+. "$_EXEC/widgets.sh"
 
 newtags=''
 for tn in $(seq 1 $(POST_COUNT tag)); do
   newtags="$(POST tag $tn)${BR}${newtags}"
 done
-newtags="$(POST newtag |tr -d '\r' |tr , '\n')${BR}${newtags}"
+newtags="$(POST newtagn |tr -d '\r' |tr , '\n')${BR}${newtags}"
+
+if [ "$(POST makegroup)" = true ]; then
+  group="$(timeid)"
+fi
 
 while [ "${newtags#${BR}}" != "${newtags}" ]; do newtags="${newtags#${BR}}"; done
 while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; done
@@ -15,13 +20,10 @@ while [ "${newtags%${BR}}" != "${newtags}" ]; do newtags="${newtags%${BR}}"; don
 [ "$(POST op)" = del ] && deltags="$newtags"
 
 for select in $(seq 1 $(POST_COUNT select)); do
-  file="$_DATA/$ITEM/$(POST select $select |PATH)"
-  meta="${file%/*}/.index/meta"
+  file="$(POST select $select)"
 
-  read -r length width height tags comment fn <<-EOF
-	$(meta_info "$file")
-	EOF
-  tags="$(UNSTRING "${tags#tags=}" |tr , '\n')"
+  read_meta "${file%.*}" || continue
+  tags="$(printf %s\\n "$META_TAGS" |tr , \\n)"
 
   if [ ! "$deltags" ]; then
     extags="$(printf '%s' "${newtags}" |grep -e "^-" |cut -d: -f1 )"
@@ -30,26 +32,25 @@ for select in $(seq 1 $(POST_COUNT select)); do
       tags="$(printf %s\\n "$tags" |grep -vEe '^-[^:]+$')"
     fi
     tags="$(printf '%s\n' "${tags},${newtags}" \
-            | tr , '\n' |sort -u |tr '\n' , \
-            | STRING)"
+            | tr , '\n' |sort -u |tr '\n' ,)"
   else
     detag="${deltags}${BR}"; while [ "$detag" ]; do
       tags="$(printf '%s\n' "$tags" |grep -vxFe "${detag%%${BR}*}")"
       detag="${detag#*${BR}}"
     done
-    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' , |STRING)"
+    tags="$(printf '%s\n' "$tags" |sort -u |tr '\n' ,)"
   fi
   tags="${tags#,}"; tags="${tags%,}"
 
-  if LOCK "$meta"; then
-    grep -avF "	$fn" "$meta" >"${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"
+  if [ "$group" ]; then
+    update_meta "$META_NAME" tags="${tags}" group="${group}"
+  else
+    update_meta "$META_NAME" tags="${tags}"
   fi
 done
+
+( if [ $(POST_COUNT select) -gt 0 ]; then
+    taglist >"$c_tags.$$"
+    mv -- "$c_tags.$$" "$c_tags"
+  fi &
+) &