X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fattendees.sh;h=aecc95d26c4bc9c5fc324ffb0f857c0b9e518a40;hp=4c84af15a8c67dac7d9f92e69a95d15610d98bbb;hb=d959549ee6cec995f6e8975002b3bc0e9375e564;hpb=3210536411f1c532d0e53acf280fb69bba7e951f diff --git a/pages/attendees.sh b/pages/attendees.sh index 4c84af1..aecc95d 100755 --- a/pages/attendees.sh +++ b/pages/attendees.sh @@ -4,22 +4,22 @@ listcards() { case "$_GET["filtertype"]" in any) - grep -il "$_GET[\"filter\"]" ${_DATA}/vcard/*vcf |debug + grep -il "$_GET[\"filter\"]" ${_DATA}/vcard/*vcf ;; name) - egrep -xil "(FN|NICKNAME|N)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug + egrep -xil "(FN|NICKNAME|N)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf ;; street) - egrep -xil "(ADR)(;.+)*:([^;]*;){2}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug + egrep -xil "(ADR)(;.+)*:([^;]*;){2}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf ;; zip) - egrep -xil "(ADR)(;.+)*:([^;]*;){5}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug + egrep -xil "(ADR)(;.+)*:([^;]*;){5}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf ;; telephone) - egrep -xil "(TEL)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug + egrep -xil "(TEL)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf ;; birth) - egrep -xil "(BDAY)(;.+)*:$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug + egrep -xil "(BDAY)(;.+)*:$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf ;; course) ;; @@ -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' \ @@ -134,7 +137,7 @@ vcf_parse() { case "$line" in key=*) echo -E "$line" ;; - value=*) echo -E "$line" |debug + value=*) echo -E "$line" ;; tag=*) ot='' echo -E "$line" \