X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fupdate_card.sh;h=b80e5128c2af135f054ad8545d000a17953ddb43;hp=7896beb5011d3cee5892b9d6c099a8693d34caa3;hb=7ba2fd0aec54c6c98c192dc7795fbda6c398d806;hpb=203fc5d63ba59a30688bac00c98d199cb08a8f30 diff --git a/cards/update_card.sh b/cards/update_card.sh index 7896beb..b80e512 100755 --- a/cards/update_card.sh +++ b/cards/update_card.sh @@ -65,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 @@ -104,14 +105,14 @@ case "$action" in update) if LOCK "$attfile"; then grep -F " ${card}" "$attfile" |while read course junk; do - touch "$_DATA/courses/${course}" + touch "$_DATA/ical/${course}" done - sed -i -r "/^.+ ${card}\$/d" "$attfile" + 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/courses/${course}" + touch "$_DATA/ical/${course}" done RELEASE "$attfile" else @@ -131,6 +132,15 @@ case "$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