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 640e3f182e95667f3fff43d5192d7e334bfdb3a3..97589ee6f7b96ccd6761799e33ea671ab95b326d 100755 (executable)
--- a/actions/generate_courselist.sh
+++ b/actions/generate_courselist.sh
@@ -1,13 +1,35 @@
 #!/bin/zsh
 
+# Copyright 2014, 2016 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
+
 pdflatex="$(where pdflatex |head -n1 || echo false)"
-course="$_GET[\"course\"]"
-fromdate=$_GET['fromdate']
+course="${_GET[course]}"
+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 '{&}\\'
+}
+
 
 list_attendee() {  #Parameter: Cardfile
   id="$1"
@@ -25,7 +47,7 @@ list_attendee() {  #Parameter: Cardfile
         if [ -z "$key" ]; then
           eval "$line"
         else
-          values[$key]="$value"
+          values[$key]="$(tex_clean "$value")"
           for t in ${(k)tag}; do
             tags[${key}_$t]="$tag[$t]"
           done
@@ -42,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
@@ -68,7 +97,7 @@ get_dates() {  #Parameter: Calendarfile
         if [ -z "$key" ]; then
           eval "$line"
         else
-          values[$key]="$value"
+          values[$key]="$(tex_clean "$value")"
           for t in ${(k)tag}; do
             tags[${key}_$t]="$tag[$t]"
           done
@@ -119,6 +148,7 @@ if [ -r "${_DATA}/ical/${course}" ]; then
   . ${_EXEC}/templates/course_print.sh >"${_DATA}/temp/courselist_${course}.tex"
   [ -e "${_DATA}/temp/courselist_${course}.pdf" ] && rm "${_DATA}/temp/courselist_${course}.pdf"
   "$pdflatex" -halt-on-error -output-directory "${_DATA}/temp/" "${_DATA}/temp/courselist_${course}.tex" |debug >/dev/null
+  "$pdflatex" -halt-on-error -output-directory "${_DATA}/temp/" "${_DATA}/temp/courselist_${course}.tex" |debug >/dev/null
 fi
 if [ -r "${_DATA}/temp/courselist_${course}.pdf" ]; then
   echo 'Content-Type: application/x-pdf\n'