]> git.plutz.net Git - confetti/blobdiff - pages/cards.sh
dirty fix: do not mess up with empty tags
[confetti] / pages / cards.sh
index 17b8f73c6fdbe60783cc0a75d996c2fb5f9e0e00..08b88b94e11b75e8eeeab786df667adb1912af3c 100755 (executable)
@@ -25,19 +25,20 @@ medical)
   view_card="$_EXEC/templates/view_client.sh"
   edit_card="$_EXEC/templates/edit_client.sh"
   _GET[order]="${_GET[order]:-lastname}"
+  _GET[filtertype]="${_GET[filtertype]:-name}"
   profile_medical=x
 ;;
 circus)
   view_card="$_EXEC/templates/view_attendee.sh"
   edit_card="$_EXEC/templates/edit_attendee.sh"
   _GET[order]="${_GET[order]:-firstname}"
+  _GET[filtertype]="${_GET[filtertype]:-any}"
   profile_circus=x
 ;;
 esac
 
 edit="${_GET[edit]}"
 [ \! -f "vcard/$edit" -a \! -f "temp/$edit" ] && edit=''
-_GET[filtertype]="${_GET[filtertype]:-any}"
 
 listcourses() {
   ls -1 ${_DATA}/ical/*ics |while read file; do
@@ -141,7 +142,7 @@ vcf_parse() {
       tag=*) ot=''
             printf %s "$line" \
             | sed -r 's:^tag=::;s:\;([A-Z+_-]+="[^"]+"|[A-Z+_-]+=[^\;]+):\n\1:g;' \
-            | sed -r 's:([A-Z+_-]+)="?(.*)"?:tag\[\1\]="\2":g' \
+            | sed -rn 's:([A-Z+_-]+)="?(.+)"?:tag\[\1\]="\2":gp' \
             | sed -r '/^ *$/d' \
             | sort |while read -r tag; do
               nt="$(printf %s "$tag" |sed -r 's:^tag\[([A-Z+_-]+)\]="(.*)"$:\1:')"