. "${_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 "$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)if N="$(pdi_value "$card" N)"; then
- IFS=\; read n1 n2 n3 n4 n5 <<-EOF
- $(pdi_value "$card" 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 HOME)" \
- "$([ "$teltype" = 'WORK' ] && printf 'selected="selected"')" "$(l10n WORK)" \
- "$([ "$teltype" = 'CELL' ] && printf 'selected="selected"')" "$(l10n CELL)" \
- "$([ "$teltype" = 'FAX' ] && printf 'selected="selected"')" "$(l10n 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
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 $(edit_item "$card" TEL)]
- [div .section .message $(
- edit_item "$card" EMAIL
- [ $(pdi_count "$card" IMPP) -gt 0 ] && edit_item "$card" IMPP
- [ $(pdi_count "$card" URL ) -gt 0 ] && edit_item "$card" URL
- )]
+ [div .section .phone $(
+ edit_item "$card" TEL EMAIL
+ [ $(pdi_count "$card" IMPP) -gt 0 ] \
+ && edit_item "$card" IMPP
+ [ $(pdi_count "$card" URL ) -gt 0 ] \
+ && edit_item "$card" URL
+ )]
[div .section .address $(edit_item "$card" ADR)]
- [div .section .note $(edit_item "$card" NOTE)]
- [div .section .attendance
- [h3 $(l10n course_attendance) ] $(
- for course in "$_DATA"/ical/*.ics; do
- printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \
- "${course##*/}" \
- "$(grep -qF "${course##*/} ${cardfile##*/}" "$_DATA/mappings/attendance" \
- && printf 'checked="checked"'
- )" \
- "$(pdi_value "$(pdi_load "$course")" SUMMARY |unescape |HTML)"
- done)
- [h3 $(l10n CATEGORIES) ] $(
- grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
- printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \
- "$(HTML "$cat")" \
- "$(seq 1 $(pdi_count "$card" CATEGORIES) |while read c; do
- pdi_value "$card" CATEGORIES $c |grep -qxF "$cat" \
- && printf 'checked="checked"' && break
- done)" \
- "$(HTML "$cat")"
- done)
- ]
+ [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 ; 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)"]
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 .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" ­%s]]' \
- "$each" \
- "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY |unescape |HTML)"
- done)]
- $(card_item "$card" CATEGORIES)
- ]
+ [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/?x=${cardfile##*/}" $(l10n vcf_export)]
+ [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
]
]
EOF
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
print_card "$cardfile" |tee "$cachefile"
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"
}
projects / lobster / blobdiff