multiple logical fixes in vcard updater

[confetti] / pages / attendees.sh

diff --git a/pages/attendees.sh b/pages/attendees.sh
index 2d06f6b9561ca6e5d6189a98d3888534ce14b122..4a352ca89724f8d3f7226f288f4b8975db6232cb 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -28,8 +28,6 @@ listcards() {
   esac
 }
 
-FIELDLIST="$(echo PHOTO LOGO FN NICKNAME SOUND GENDER KIND TITLE ROLE ORG MEMBER CATEGORIES ANNIVERSARY BDAY EMAIL TEL IMPP ADR URL LANG NOTE RELATED |tr ' ' '\n')"
-
 vcf_parse() {
   tr -d '\n' <"$1" |sed -r 's:\r ::g;s:\r:\n:g' \
   | sed -rn '
@@ -37,7 +35,7 @@ vcf_parse() {
     s:^X-MS-CARDPICTURE:001 PHOTO:p;
     s:^LOGO:002 LOGO:p;
     s:^FN:003 FN:p;
-    s:^N:004 N:p
+    s:^N[\:;]:004 &:p
     s:^NICKNAME:005 NICKNAME:p;
     s:^SOUND:006 SOUND:p;
     s:^GENDER:007 GENDER:p;
@@ -104,7 +102,7 @@ vcf_parse() {
 
     s:^([A-Z].*)$:024 \1:p;
     ' \
-  | sort |while read -r line; do
+  |sort |while read -r line; do
     case "$line" in
       00[012]*)
        echo -E "$line"
@@ -118,16 +116,19 @@ vcf_parse() {
          |sed -r 's:,: :;s:\;: :g;s: +: :g' \
          |tr -d '\r'
        )
+       echo -E "$line"
        ;;
       005*)
        nick=$(echo -E "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
+       echo -E "$line"
        ;;
-      *) [ -n "$n" ] && fn="$n"
-        [ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
-        [ -n "$fn" ] && echo -E "003 FN:$fn" \
+      *)
+        [ -n "$n" ] && fn="$n"
+       #[ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
+       [ -n "$fn" ] && echo -E "003 FN:$fn" \
                      || echo -E "003 FN:$nick"
-        echo -E "$line"
-        cat
+       echo -E "$line"
+       cat
        ;;
     esac
   done |tr -d '\r' \