fix another typo. OK, it is really about a broken c+p function m-)

[confetti] / actions / generate_courselist.sh

diff --git a/actions/generate_courselist.sh b/actions/generate_courselist.sh
index f6fdda7dadb473e3933e59ad2805dc8448779db6..97589ee6f7b96ccd6761799e33ea671ab95b326d 100755 (executable)
--- a/actions/generate_courselist.sh
+++ b/actions/generate_courselist.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
 #!/bin/zsh
 

-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2016 Paul Hänsch

 #
 # This file is part of Confetti.
 # 
 #
 # This file is part of Confetti.
 # 


@@ -19,15 +19,15 @@
 
 pdflatex="$(where pdflatex |head -n1 || echo false)"
 course="${_GET[course]}"
 
 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)
 
 fromdate=$(date -d "$fromdate" +%s)
 [ -z "$fromdate" ] && fromdate=$(date +%s)
 

-. ${_EXEC}/pages/courses.sh loadfunctions
-. ${_EXEC}/pages/card.sh loadfunctions
+. ${_EXEC}/pages/courses.sh
+. ${_EXEC}/pages/cards.sh

 
 tex_clean() { #in dire need for improvement
 
 tex_clean() { #in dire need for improvement

-  echo "$*" |tr -d '{&}\'
+  echo "$*" |tr -d '{&}\\'

 }
 
 
 }
 
 


@@ -64,15 +64,22 @@ list_attendee() {  #Parameter: Cardfile
     esac
   done
 
     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
   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
   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
 }
 
 get_dates() {  #Parameter: Calendarfile