merge from confetti

[lobster] / cards / update_card.sh

diff --git a/cards/update_card.sh b/cards/update_card.sh
index d942e9abdbc527aa5ff803bc8c0b4dd501355778..2ee69318c28da5c502d6e89a4c9b6364cebbe9c3 100755 (executable)
--- a/cards/update_card.sh
+++ b/cards/update_card.sh
@@ -22,7 +22,7 @@
 . "$_EXEC/cgilite/storage.sh"
 
 unset filter order card action newfield
-unset cardfile attfile tempfile
+unset cardfile tempfile
 unset vcf field cnt delete_key
 
 filter="$(REF f)"
@@ -30,7 +30,6 @@ order="$(REF o)"
 
 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-]*')"
@@ -50,17 +49,9 @@ elif [ "$(POST tid)" != "$(transid "$tempfile")" ]; then
   exit 0
 fi
 
-vcf_escape(){
-  for each in "$@"; do
-    printf %s\\n "$each" \
-    | sed -E ':X;$!{N;bX}; s;\r\n;\n;g; s;([;,\\]);\\\1;g; s;\n;\\n;g;'
-  done \
-  | sed -E ':X;$!{N;bX}; s;\n;\;;g'
-}
-
 # [ "${_POST[hi_select]}" = "list" ] || _POST[hi_company]="${_POST[hi_other]}"
 # [ -n "${_POST[hi_company]}${_POST[hi_number]}${_POST[hi_status]}" ] \
-# && _POST[X-HEALTH-INSURANCE]="$(vcf_escape "${_POST[hi_company]}" "${_POST[hi_number]}" "${_POST[hi_status]}")"
+# && _POST[X-HEALTH-INSURANCE]="$(pdi_escape "${_POST[hi_company]}" "${_POST[hi_number]}" "${_POST[hi_status]}")"
 
 vcf="$(pdi_load "$tempfile")"
 
@@ -76,14 +67,28 @@ for field in $(POST_KEYS |grep -xE '[A-Z][A-Z0-9-]*'); do
   for cnt in $(seq 1 $(POST_COUNT "$field")); do
     case "$field" in
       # (TEL)
-      #   printf '%s;TYPE=%s:%s\r\n' "${field}" "${_POST[phonetype${key#TEL}]}" "$(vcf_escape "$(POST "$field" "$cnt")")"
+      #   printf '%s;TYPE=%s:%s\r\n' "${field}" "${_POST[phonetype${key#TEL}]}" "$(pdi_escape "$(POST "$field" "$cnt")")"
       #   ;;
+      X-HEALTH-INSURANCE)
+        hi_select="$(POST "$field" "$cnt")"
+        if [ "$hi_select" = list ]; then
+          vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(pdi_escape "$(POST "hi_company" "$cnt")" \
+                                                                       "$(POST "hi_number" "$cnt")" \
+                                                                       "$(POST "hi_status" "$cnt")" \
+                                                          )")"
+        elif [ "$hi_select" = other ]; then
+          vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(pdi_escape "$(POST "hi_other" "$cnt")" \
+                                                                       "$(POST "hi_number" "$cnt")" \
+                                                                       "$(POST "hi_status" "$cnt")" \
+                                                          )")"
+        fi
+        ;;
       TEL)
          vcf="$(pdi_update_attrib "$vcf" TEL $cnt TYPE="$(POST teltype $cnt |grep -Exm1 'HOME|WORK|CELL|FAX')")"
-         vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(vcf_escape "$(POST "$field" "$cnt")")")"
+         vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(pdi_escape "$(POST "$field" "$cnt")")")"
          ;;
       *)
-         vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(vcf_escape "$(POST "$field" "$cnt")")")"
+         vcf="$(pdi_update_value "$vcf" "$field" "$cnt" "$(pdi_escape "$(POST "$field" "$cnt")")")"
         ;;
     esac
 done; done
@@ -101,51 +106,26 @@ 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"
+printf '%s' "$vcf" | sed -E '/^$/d; s/^([^:]+);:/\1:/;' >"$tempfile"
 
 case "$action" in
   addfield)
-    REDIRECT "/cards/?o=${order}&f=${filter}&e=${card}"
+    REDIRECT "/cards/?o=${order}&f=${filter}&e=${card#/}"
     ;;
   update)
-    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"
-    REDIRECT "/cards/?o=${order}&f=${filter}#${card}"
+    REDIRECT "/cards/?o=${order}&f=${filter}#${card#/}"
     ;;
   cancel)
     RELEASE_SLOCK "$cardfile"
     [ -f "$cardfile" ] \
-    && REDIRECT "/cards/?o=${order}&f=${filter}#${card}" \
+    && REDIRECT "/cards/?o=${order}&f=${filter}#${card#/}" \
     || REDIRECT "/cards/?o=${order}&f=${filter}"
     ;;
   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