bugfix: always rewrite all category records when updating card

[confetti] / cards / update_card.sh

diff --git a/cards/update_card.sh b/cards/update_card.sh
index c2b972069011faf5ff47d160259a4f70e5188255..b80e5128c2af135f054ad8545d000a17953ddb43 100755 (executable)
--- a/cards/update_card.sh
+++ b/cards/update_card.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014, 2016, 2019 Paul Hänsch
+# Copyright 2014, 2016, 2019, 2020 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -19,14 +19,27 @@
 
 . "$_EXEC/pdiread.sh"
 . "$_EXEC/session_lock.sh"
+. "$_EXEC/cgilite/storage.sh"
+
+unset filter order card action newfield
+unset cardfile attfile tempfile
+unset vcf field cnt delete_key
 
 filter="$(REF f)"
 order="$(REF o)"
 
-card="$(POST card)"
-cardfile="$_DATA/vcard/$card"
+card="$(POST card |PATH)"; card="${card##*/}"
+cardfile="$_DATA/vcard/${card}"
 attfile="$_DATA/mappings/attendance"
 
+action="$(POST action)"
+newfield="$(POST newfield |grep -m 1 -xE '[A-Z][A-Z0-9-]*')"
+
+if printf '%s\n' "$action" |grep -qxE 'addfield [A-Z][A-Z0-9]*'; then
+  newfield="${action##* }"
+  action=addfield
+fi
+
 if ! tempfile=$(CHECK_SLOCK "$cardfile"); then
   SET_COOKIE 0 message="NO VALID FILE LOCK"
   REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
@@ -52,6 +65,7 @@ vcf_escape(){
 vcf="$(pdi_load "$cardfile")"
 
 vcf="$(pdi_update_value "$vcf" N 1 "$(vcf_escape "$(POST 1N)" "$(POST 2N)" "$(POST 3N)" "$(POST 4N)" "$(POST 5N)")")"
+vcf="$(printf '%s\n' "$vcf" |sed -E "/^CATEGORIES;[^:]*:.*$/d")"
 
 for field in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*'); do
   for cnt in $(seq 1 $(POST_COUNT "$field")); do
@@ -68,29 +82,42 @@ for field in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*'); do
         ;;
     esac
 done; done
-[ "$(POST action)" = addfield ] && vcf="$(vcf_update_field "$vcf" "$(POST newfield)" $(($(pdi_count $(POST newfield)) + 1)) '')"
 
+# delete fields, first mark for deletion using delete_key
+# this way the field enumeration is preserved during the process
+# finally filter marked lines
+delete_key="$(randomid)"
+for delete in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*_delete_[0-9]+'); do
+  f="${delete%%_*}"; c="${delete##*_}";
+  [ "$(POST "$delete")" = "true" ] && vcf="$(pdi_update_value "$vcf" "$f" "$c" "delete=${delete_key}")"
+done
+vcf="$(printf '%s\n' "$vcf" |sed -E "/^[^:]+:delete=${delete_key}\$/d")"
+
+if [ "$action" = addfield ]; then
+  vcf="$(pdi_update_value "$vcf" "$newfield" $(( $(pdi_count "$vcf" "$newfield") + 1 )) '')"
+fi
 printf '%s' "$vcf" |grep -vx '' >"$tempfile"
 
-case "$(POST action)" in
+case "$action" in
   addfield)
     REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
     ;;
   update)
-    # attendance=()
-    # for att in attendance attendance{0..100}; do
-    #   [ -n "${_POST[$att]}" ] && attendance+=("${_POST[$att]}")
-    # done
-    # sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
-    #   touch "$_DATA/ical/$course"
-    # done
-    # sed -i -r '/^(.+)\t'$card'$/d' "$attfile"
-    # for each in $attendance; do
-    #   echo "$each\t$card"
-    # done >>"$attfile"
-    # sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
-    #   touch "$_DATA/ical/$course"
-    # done
+    if LOCK "$attfile"; then
+      grep -F "        ${card}" "$attfile" |while read course junk; do
+        touch "$_DATA/ical/${course}"
+      done
+      sed -i -E "/^.+  ${card}\$/d" "$attfile"
+      seq 1 $(POST_COUNT attendance) |while read n; do
+        printf '%s     %s\n' "$(POST attendance $n)" "$card"
+      done >>"$attfile"
+      grep -F "        ${card}" "$attfile" |while read course junk; do
+        touch "$_DATA/ical/${course}"
+      done
+      RELEASE "$attfile"
+    else
+      SET_COOKIE 0 message="COULD NOT UPDATE COURSE MAPPINGS"
+    fi
 
     cp "$tempfile" "$cardfile"
     RELEASE_SLOCK "$cardfile"
@@ -105,6 +132,15 @@ case "$(POST action)" in
   delete)
     rm "$cardfile"
     RELEASE_SLOCK "$cardfile"
+    if LOCK "$attfile"; then
+      grep -F "        ${card}" "$attfile" |while read course junk; do
+        touch "$_DATA/ical/${course}"
+      done
+      sed -i -E "/^.+  ${card}\$/d" "$attfile"
+      RELEASE "$attfile"
+    else
+      SET_COOKIE 0 message="COULD NOT UPDATE COURSE MAPPINGS"
+    fi
     REDIRECT "/cards/?o=${order}&f=${filter}"
     ;;
 esac