X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fattendees.sh;h=b6088d660a4a7a028c17b7b0526bc984b93393e0;hp=75092c13143511d995a5308a67655ce930c561fc;hb=28a2c1efac4c9bb93a57f09a387f5991e0c7573c;hpb=2dc9740e1452127d64d027b57432032242f04eff

diff --git a/pages/attendees.sh b/pages/attendees.sh
index 75092c1..b6088d6 100755
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -38,7 +38,7 @@ vcf_parse() {
     s:^X-YAHOO(;[^"\:]+|;"[^"]+")*\:(.*)$:018 IMPP\1\:ymsgr\:\2:p;
     s:^X-SIP(;[^"\:]+|;"[^"]+")*\:(sip\:)?(.*)$:018 IMPP\1\:sip\:\3:p;
     s:^ADR:019 ADR:p;
-    s:^LABEL:020 LABEL:p;
+    s:^LABEL(;[^"\:]+|;"[^"]+")*\:(.*)$:019 ADR;LABEL="\2"\1\::p;
     s:^URL:021 URL:p;
     s:^X-EVOLUTION-BLOG-URL:021 URL:p;
     s:^LANG:022 LANG:p;
@@ -56,12 +56,12 @@ vcf_parse() {
     s:^X-EVOLUTION-SPOUSE:025 RELATED\;TYPE=spouse;VALUE=text:p;
     s:^X-KADDRESSBOOK-X-SpouseName:025 RELATED\;TYPE=spouse;VALUE=text:p;
 
-    s:^BEGIN.*$::;
+    s:^BEGIN.*$:000 &:p;
     s:^CALADRURI.*$::;
     s:^CALURI.*$::;
     s:^CLASS.*$::;
     s:^CLIENTPIDMAP.*$::;
-    s:^END.*$::;
+    s:^END.*$:100 &:p;
     s:^FBURL.*$::;
     s:^GEO.*$::;
     s:^MAILER.*$::;
@@ -73,38 +73,60 @@ vcf_parse() {
     s:^SOURCE.*$::;
     s:^TZ.*$::;
     s:^UID.*$::;
-    s:^VERSION.*$::;
+    s:^VERSION.*$:000 VERSION\:4.0:p;
     s:^XML.*$::;
 
     s:^([A-Z].*)$:024 \1:p;
     ' \
   | sort |while read -r line; do
     case "$line" in
-      001*)
-	echo -E "$line"
-	;;
-      002*)
+      00[012]*)
 	echo -E "$line"
 	;;
       003*)
-	fn=$(echo "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
+	fn=$(echo -E "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
 	;;
       004*)
-	n=$(echo "$line" |sed -rn 's:^([0-9]{3} )([^;\:]+)(;[^"\:]+|;"[^"]+")*\:([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\7 \5 \6 \4 \8:gp' |sed -r 's:,: :;s:\;: :g;s: +: :g' |tr -d '\r')
+	n=$(echo -E "$line" \
+	  |sed -rn 's:^([0-9]{3} )([^;\:]+)(;[^"\:]+|;"[^"]+")*\:([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\7 \5 \6 \4 \8:gp' \
+	  |sed -r 's:,: :;s:\;: :g;s: +: :g' \
+	  |tr -d '\r'
+	)
 	;;
       005*)
-	nick=$(echo "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
+	nick=$(echo -E "$line" |sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:\3:g' |tr -d '\r')
 	;;
-      *) [ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
-         [ -n "$n"  -a -n "$nick" ] &&  n="$n aka. $nick"
-	 [ -n "$fn" -a -z "$n" ] && echo "003 FN:$fn"
-	 [ -n "$n" ]		 && echo "003 FN:$n"
-	 [ -z "$fn" -a -z "$n" ] && echo "003 FN:$nick"
+      *) [ -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
 	;;
     esac
-  done | sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:key=\1\nvalue=\3\ntag=\2:g'
+  done |tr -d '\r' \
+  | sed -r 's:^[0-9]{3} ([^;\:]+)(;[^"\:]+|;"[^"]+")*\:(.*)$:key="\1"\nvalue="\3"\ntag=\2:g' \
+  | while read -r line; do
+    case "$line" in
+      key=*) echo -E "$line"
+	;;
+      value=*) echo -E "$line"
+	;;
+      tag=*) ot=''
+	     echo -E "$line" \
+	     | sed -r 's:^tag=::;s:\;([A-Z+_-]+="[^"]+"|[A-Z+_-]+=[^\;]+):\n\1:g;' \
+	     | sed -r 's:([A-Z+_-]+)="?(.*)"?:tag\[\1\]="\2":g' \
+	     | sed -r '/^ *$/d' \
+	     | sort |while read -r tag; do
+	       nt="$(echo -E "$tag" |sed -r 's:^tag\[([A-Z+_-]+)\]="(.*)"$:\1:')"
+	       nv="$(echo -E "$tag" |sed -r 's:^tag\[([A-Z+_-]+)\]="(.*)"$:\2:')"
+	       [ "$nt" = "$ot" ] && vl="$nv,$vl" || vl="$nv"
+	       echo -E "tag[$nt]=\"$vl\""
+	       ot="$nt"
+	     done
+	;;
+    esac
+  done
 }
 
 case "$1" in