X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fattendees.sh;h=4a352ca89724f8d3f7226f288f4b8975db6232cb;hp=9ea073e6a1c2b5e965c13af98207c4e423538970;hb=be5f12e43f464b3ca924b2131fe74d6cf24981a1;hpb=9da739230659371a860e93dcaf3765b977e30de7

diff --git a/pages/attendees.sh b/pages/attendees.sh
index 9ea073e..4a352ca 100755
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -35,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;
@@ -102,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"
@@ -116,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' \