X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=4e40072a9b396889196794ce044801358891a835;hp=ab2be506a8c9b9c25fdc9089f497ac8e3c1b6aea;hb=203fc5d63ba59a30688bac00c98d199cb08a8f30;hpb=bab7cadaeae32434eb16872bd8e09449817d4f90

diff --git a/cards/list.sh b/cards/list.sh
index ab2be50..4e40072 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -2,177 +2,6 @@
 
 . "${_EXEC}"/pdiread.sh
 
-unescape() { [ $# = 0 ] && sed -E 's;\\(.);\1;g' || printf %s "$*" |sed -E 's;\\(.);\1;g'; }
-upcase=' y;abcdefghijklmnopqrstuvwxyzäöüé;ABCDEFGHIJKLMNOPQRSTUVWXYZÄÖÜÉ;; '
-
-card_item(){
-  local card="$1"
-  local item cnt c
-  shift 1
-
-  for item in $@; do
-    cnt="$(pdi_count "$card" "$item")"
-
-    case $item in
-      FN) printf '[h2 .item .FN ­%s]' "$(pdi_value "$card" FN |unescape |HTML)"
-        ;;
-      GENDER) printf '[span .item .GENDER ­%s]' "$(pdi_value "$card" GENDER |l10n)"
-        ;;
-      NICKNAME) seq 1 $cnt |while read c; do
-          printf '[span .item .NICKNAME ­aka. "%s"]' \
-                 "$(pdi_value "$card" NICKNAME $c |unescape |HTML)"
-        done
-        ;;
-      X-ZACK-JOINDATE|X-ZACK-LEAVEDATE) if [ $cnt -gt 0 ]; then
-          printf '[span .item .%s [b %s:] %s]' \
-                 "$item" "$(l10n "${item}_short")" \
-                 "$(pdi_value "$card" "$item" |HTML)"
-        fi
-        ;;
-      BDAY) if [ $cnt -gt 0 ]; then
-          printf '[span .item .BDAY [b *:] %s]' \
-                 "$(pdi_value "$card" BDAY |grep -xE '[0-9-]+')"
-        fi
-        ;;
-      SOUND) if [ $cnt -gt 0 ]; then
-          printf '[audio .item .SOUND controls="controls"
-                    [source type="audio/ogg" src="data:audio/ogg;base64,%s"]
-                  ]' \
-                 "$(pdi_value "$card" SOUND |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
-        ;;
-      PHOTO|LOGO) if [ $cnt -gt 0 ]; then 
-          printf '[img .item .%s src="data:image/%s;base64,%s"]' "$item" \
-                 "$(pdi_attrib "$card" "$item" |sed -E 's;^(.*;)?TYPE="?(.+)"?(;.*)?$;\2;')" \
-                 "$(pdi_value "$card" "$item" |grep -xE '[a-zA-Z0-9/+=]+')"
-        fi
-        ;;
-      EMAIL) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n EMAIL)"
-          seq 1 $cnt |while read c; do
-            printf '[a .item .EMAIL href="mailto:%s" ­%s]' \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)" \
-                   "$(pdi_value "$card" EMAIL $c |unescape |HTML)"
-          done
-        fi
-        ;;
-      TEL) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n TEL)"
-          seq 1 $cnt |while read c; do
-            teltype="$(pdi_attrib "$card" TEL $c TYPE)"
-            [ "$teltype" ] \
-            && printf '[span .item .TEL [span .type ­%s:] %s]' \
-                      "$(l10n "TYPE=$teltype" |HTML)" \
-                      "$(pdi_value "$card" TEL $c |unescape |HTML)" \
-            || printf '[span .item .TEL ­%s]' \
-                      "$(pdi_value "$card" TEL $c |unescape |HTML)"
-          done
-        fi
-        ;;
-      *) if [ $cnt -gt 0 ]; then
-          printf '[h3 %s]' "$(l10n "$item")"
-          seq 1 $cnt |while read c; do
-            printf '[span .item .%s ­%s]' "$item" \
-                   "$(pdi_value "$card" "$item" $c |unescape |HTML)"
-          done
-        fi
-        ;;
-    esac
-  done
-}
-
-edit_item(){
-  local card="$1"
-  local item cnt c
-  shift 1
-
-  for item in $@; do
-    cnt="$(pdi_count "$card" "$item")"
-    [ $cnt -lt 1 ] && cnt=1
-
-    case $item in
-      N)N="$(pdi_value "$card" N)"
-        if [ "$N" ]; then
-          IFS=\; read n1 n2 n3 n4 n5 <<-EOF
-		$N
-		EOF
-        else
-	  N="$(pdi_value "$card" FN |unescape)"
-          n1="${N%%[a-z]*}" n1="${N#$n1}"
-          [ "$n1" ] || n1="${N##* }"
-          n2="${N%$n1}"
-        fi
-        printf '
-        [h3 %s]
-        [input .item .N name="4N" placeholder="%s" value="%s"]
-        [input .item .N name="2N" placeholder="%s" value="%s"]
-        [input .item .N name="1N" placeholder="%s" value="%s"]
-        [input .item .N name="5N" placeholder="%s" value="%s"]
-        ' "$(l10n "$item")" \
-        "$(l10n n_pre)"   "$(HTML "$n4")" \
-        "$(l10n n_first)" "$(HTML "$n2" "$n3")" \
-        "$(l10n n_last)"  "$(HTML "$n1")" \
-        "$(l10n n_post)"  "$(HTML "$n5")"
-        ;;
-      GENDER)
-        gender="$(pdi_value "$card" GENDER)"
-        printf '
-        [select .item .GENDER name="GENDER"
-          [option value="" disabled="disabled" %s %s]
-          [option value="female" %s %s]
-          [option value="male"   %s %s]
-          [option value="other"  %s %s]
-          [option value="none"   %s %s]
-        ]\n' \
-        "$([ "$gender" = ''       ] && printf 'selected="selected"')" "$(l10n GENDER)" \
-        "$([ "$gender" = 'female' ] && printf 'selected="selected"')" "$(l10n gender_female)" \
-        "$([ "$gender" = 'male'   ] && printf 'selected="selected"')" "$(l10n gender_male)" \
-        "$([ "$gender" = 'other'  ] && printf 'selected="selected"')" "$(l10n gender_other)" \
-        "$([ "$gender" = 'none'   ] && printf 'selected="selected"')" "$(l10n gender_none)"
-        ;;
-      BDAY|X-ZACK-JOINDATE|X-ZACK-LEAVEDATE)
-        printf '[h3 %s]
-        [input .item .%s name="%s" value="%s" placeholder="YYYY-MM-DD"]
-        ' \
-        "$(l10n "$item")" "$item" "$item" "$(pdi_value "$card" "$item" |grep -xE '[0-9-]+')"
-        ;;
-      ADR|NOTE)
-        printf '[h3 %s]' "$(l10n "$item")"
-        seq 1 $cnt |while read c; do
-          printf '<textarea class="item %s" name="%s">%s</textarea>' \
-          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)"
-        done
-        ;;
-      TEL) printf '[h3 %s]' "$(l10n "$item")"
-        seq 1 $cnt |while read c; do
-          teltype="$(pdi_attrib "$card" TEL $c TYPE)"
-          printf '[select .item .teltype name="teltype"
-                    [option value="" disabled="disabled" %s %s]
-                    [option value="HOME" %s %s]
-                    [option value="WORK" %s %s]
-                    [option value="CELL" %s %s]
-                    [option value="FAX"  %s %s]
-                  ]\n' \
-                  "$([ "$teltype" = ''     ] && printf 'selected="selected"')" "$(l10n teltype)" \
-                  "$([ "$teltype" = 'HOME' ] && printf 'selected="selected"')" "$(l10n TYPE=HOME)" \
-                  "$([ "$teltype" = 'WORK' ] && printf 'selected="selected"')" "$(l10n TYPE=WORK)" \
-                  "$([ "$teltype" = 'CELL' ] && printf 'selected="selected"')" "$(l10n TYPE=CELL)" \
-                  "$([ "$teltype" = 'FAX'  ] && printf 'selected="selected"')" "$(l10n TYPE=FAX)"
-
-          printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \
-          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
-        done
-        ;;
-      *) printf '[h3 %s]' "$(l10n "$item")"
-        seq 1 $cnt |while read c; do
-          printf '[input .item .%s name="%s" value="%s" placeholder="%s"]' \
-          "$item" "$item" "$(pdi_value "$card" "$item" $c |unescape |HTML)" "$(l10n "$item")"
-        done
-        ;;
-    esac
-  done
-}
-
 edit_card(){
   local cardfile="$_DATA/vcard/$1" 
   local tempfile card
@@ -211,8 +40,8 @@ edit_card(){
 	             "${course##*/}" \
 	             "$(grep -qF "${course##*/}	${cardfile##*/}" "$_DATA/mappings/attendance" \
 	                && printf 'checked="checked"'
-	             )" \
-	             "$(pdi_value "$(pdi_load "$course")" SUMMARY |unescape |HTML)"
+	               )" \
+	             "$(pdi_value "$(pdi_load "$course")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
 	    done)
 	    [h3 $(l10n CATEGORIES) ] $(
 	    grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
@@ -249,24 +78,24 @@ print_card(){
   local card="$(pdi_load "$cardfile")"
   cat <<-EOF
     [div .card #${cardfile##*/}
-      [div .section .basic &shy;$(
+      [div .section .basic . $(
         card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
       )]
-      [div .section .phone   &shy;$(card_item "$card" TEL)]
-      [div .section .message &shy;$(card_item "$card" EMAIL IMPP URL)]
-      [div .section .address &shy;$(card_item "$card" ADR)]
-      [div .section .note    &shy;$(card_item "$card" NOTE)]
-      [div .section .attendance [h3 $(l10n course_attendance) ] [ul &shy;
+      [div .section .phone   . $(card_item "$card" TEL)]
+      [div .section .message . $(card_item "$card" EMAIL IMPP URL)]
+      [div .section .address . $(card_item "$card" ADR)]
+      [div .section .note    . $(card_item "$card" NOTE)]
+      [div .section .attendance [h3 $(l10n course_attendance) ] [ul
         $(grep -F "	${cardfile##*/}" "$_DATA/mappings/attendance" |while read each discard; do
-          printf '[li [a .item .attendance href="/courses#%s" &shy;%s]]' \
+          printf '[li [a .item .attendance href="/courses#%s" . %s]]' \
                  "$each" \
-                 "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY |unescape |HTML)"
+                 "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
         done)]
         $(card_item "$card" CATEGORIES)
       ]
       [div .control
         [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
-        [a .item href="/cards/?x=${cardfile##*/}" $(l10n vcf_export)]
+        [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
 	EOF
@@ -277,8 +106,9 @@ print_cards(){
 
   while read cardfile; do
     cachefile="${_DATA}/cache/${cardfile##*/}.cache"
-    if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \
-                         -a "$cachefile" -nt "${_EXEC}/cards" ]; then
+    # if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" \
+    #                      -a "$cachefile" -nt "${_EXEC}/cards" ]; then
+    if [ -s "$cachefile" -a "$cachefile" -nt "$cardfile" ]; then
       cat "$cachefile"
     else
       print_card "$cardfile" |tee "$cachefile"