X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Flist.sh;h=616d6abb1b966f90531937d1aa5a6938e5c5da5f;hb=b67065bfb57b072dd1c344eedabfbb545eae6629;hp=2735c5426d7218dbc0892098bd5b30ad47d6babd;hpb=7c3de62f78eba0142bc054bdda1f3ab1cb1c20a4;p=lobster

diff --git a/cards/list.sh b/cards/list.sh
index 2735c54..616d6ab 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -13,16 +13,14 @@ edit_card(){
   else
     card="$(pdi_load "$tempfile")"
     cat <<-EOF
-	[form .card #${cardfile##*/} action="/cards/update_card.sh" method="POST"
+	[span .card-anchor #${cardfile##*/}]
+	[form .card action="/cards/update_card.sh" method="POST"
 	  [input type="hidden" name="tid" value="$(transid ${tempfile})"]
 	  [div .section .basic $(
 	    edit_item "$card" N GENDER
 	    [ "$(pdi_count "$card" NICKNAME)" -gt 0 ] \
 	    && edit_item "$card" NICKNAME
 	    edit_item "$card" BDAY
-	    edit_item "$card" X-ZACK-JOINDATE
-	    [ "$(pdi_count "$card" X-ZACK-LEAVEDATE)" -gt 0 ] \
-	    && edit_item "$card" X-ZACK-LEAVEDATE
 	    card_item "$card" SOUND PHOTO LOGO
 	  )]
 	  [div .section .phone   $(
@@ -36,15 +34,20 @@ edit_card(){
 	  [div .section .insurance $(edit_item "$card" X-HEALTH-INSURANCE)]
 	  [div .section .note    $(edit_item "$card" NOTE X-CLIENT-REFERRAL)]
 	  [div .control
-	    [select .item name="newfield"
-	      [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
-	      $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
-	        printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
-	      done)
-	   ][button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+	    [div .item .delete label="$(l10n edit_delete)"
+              [input type="checkbox" #delete]
+              [label for="delete" $(l10n edit_delete)]
+	      [button type="submit" name="action" value="delete" $(l10n edit_delete)]
+            ]
+            [div .item .newfield
+              [select name="newfield"
+	        [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
+	        $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
+	          printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
+	        done)
+	      ][button type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+            ]
 	    [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
-	    [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)]
-	      [button .item type="submit" name="action" value="delete"]
 	    [button .item type="submit" name="action" value="cancel"   $(l10n edit_cancel)]
 	  ]
 	  [input type="hidden" name="UID" value="$(pdi_value "$card" UID |HTML)"]
@@ -57,18 +60,27 @@ edit_card(){
 print_card(){
   local cardfile="$1"
   local card="$(pdi_load "$cardfile")"
+  local N1 N2 N3 N4 N5
+  IFS=\; read N1 N2 N3 N4 N5 <<-EOF
+	$(pdi_value "$card" N |pdi_unescape |HTML)
+	EOF
+
   cat <<-EOF
     [div .card #${cardfile##*/}
-      [div .section .basic $(
-        card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
+      [div .section .basic
+      [h2 .item .FN . $N4 $N1 $N5]
+      [span .item .firstname . $N2 $N3]
+      $(
+        card_item "$card" GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
       )]
       [div .section .address   $(card_item "$card" ADR)]
       [div .section .phone     $(card_item "$card" TEL EMAL IMPP URL)]
       [div .section .insurance $(card_item "$card" X-HEALTH-INSURANCE)]
       [div .section .note      $(card_item "$card" NOTE X-CLIENT-REFERRAL)]
+      [div .section .therapies $(card_item "$card" therapies)]
       [div .control
-        [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
-        [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
+        [a .item .button href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
+        [a .item .button href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
 	EOF
@@ -79,8 +91,6 @@ 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" ]; then
       cat "$cachefile"
     else
@@ -93,31 +103,31 @@ filter_cards(){
   local filter f fex='x;p;'
 
   filter="$(printf %s "${filter}" \
-            | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\\\&;g;
+            | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\&;g;
                       '"$upcase"
            )^"
 
   while [ "$filter" ]; do
     f="${filter%%^*}" filter="${filter#*^}"
+    debug "Filter: $f"
     case $f in
       '') break
         ;;
-      ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      ANY:*) fex="/\n.*(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
     esac
   done
 
   for cardfile in "${_DATA}"/vcard/*.vcf; do
-    printf '%s\n' "$cardfile"
-    cat "$cardfile"
+    printf '%s\n' "$cardfile" "$(grep -vxE " *${CR}?" "$cardfile")"
   done \
-  | sed -En ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
+  | sed -En ':X; /\nEND;?:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
              '"$upcase""$fex"
 }