X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=actions%2Fgenerate_courselist.sh;h=97589ee6f7b96ccd6761799e33ea671ab95b326d;hp=6ea6d438e71aa67601760fe88235b0918a40adc2;hb=fa569abc3f855692322f791a0c1112f85126e990;hpb=4e49d483fd5121fda86a33cf583c15afa6556ad1

diff --git a/actions/generate_courselist.sh b/actions/generate_courselist.sh
index 6ea6d43..97589ee 100755
--- a/actions/generate_courselist.sh
+++ b/actions/generate_courselist.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2016 Paul Hänsch
 #
 # This file is part of Confetti.
 # 
@@ -19,15 +19,15 @@
 
 pdflatex="$(where pdflatex |head -n1 || echo false)"
 course="${_GET[course]}"
-fromdate=$_GET['fromdate']
+fromdate=$_GET[fromdate]
 fromdate=$(date -d "$fromdate" +%s)
 [ -z "$fromdate" ] && fromdate=$(date +%s)
 
-. ${_EXEC}/pages/courses.sh loadfunctions
-. ${_EXEC}/pages/attendees.sh loadfunctions
+. ${_EXEC}/pages/courses.sh
+. ${_EXEC}/pages/cards.sh
 
 tex_clean() { #in dire need for improvement
-  echo "$*" |tr -d '{&}\'
+  echo "$*" |tr -d '{&}\\'
 }
 
 
@@ -64,15 +64,22 @@ list_attendee() {  #Parameter: Cardfile
     esac
   done
 
+  n=$(printf %s "$values[N]" \
+      | sed -rn 's:^([^;]*)(;[^;]*)(;[^;]*)?(;[^;]*)?(;[^;]*)?$:\4 \2 \3 \1 \5:gp' \
+      | sed -r 's:,: :;s:;: :g;s: +: :g;s:^ $::;'
+     )
+  fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
+
   tel=''
   for n in TEL TEL{0..10}; do if (echo "$values[$n]" |grep -Eq '[0-9]'); then
     [ -n "$tel" ] && tel="$tel\\newline $values[$n]" || tel="$values[$n]"
   fi; done
+
   note=''
   for n in NOTE NOTE{0..10}; do if [ -n "$values[$n]" ]; then
     [ -n "$note" ] && note="$note\\newline $values[$n]" || note="$values[$n]"
   fi; done
-  echo -E "$values[FN] & $values[BDAY] & $tel & $note"
+  echo -E "$fullname & $values[BDAY] & $tel & $note"
 }
 
 get_dates() {  #Parameter: Calendarfile