implemented vcf caching

svn path=/trunk/; revision=14

diff --git a/index.cgi b/index.cgi
index 90ded2d30b79bef9c9f0882106121eb6420c949f..def6da0b4c8f72797bab10e7af5cc7bc03ff5e27 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -30,7 +30,7 @@ debug "Storage dir: $_DATA"
 [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage
-for each in "$_DATA"/{vcard,mappings,courses}; do
+for each in "$_DATA"/{vcard,mappings,courses,cache}; do
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done

diff --git a/pages/attendees.sh b/pages/attendees.sh
index 4c84af15a8c67dac7d9f92e69a95d15610d98bbb..1a34b8b2e4780abc28422ccdd6fc3bf9a660d180 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -4,22 +4,22 @@
 listcards() {
   case "$_GET["filtertype"]" in
     any)
-       grep -il "$_GET[\"filter\"]" ${_DATA}/vcard/*vcf |debug
+       grep -il "$_GET[\"filter\"]" ${_DATA}/vcard/*vcf
       ;;
     name)
-       egrep -xil "(FN|NICKNAME|N)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug
+       egrep -xil "(FN|NICKNAME|N)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf
       ;;
     street)
-       egrep -xil "(ADR)(;.+)*:([^;]*;){2}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug
+       egrep -xil "(ADR)(;.+)*:([^;]*;){2}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf
       ;;
     zip)
-       egrep -xil "(ADR)(;.+)*:([^;]*;){5}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug
+       egrep -xil "(ADR)(;.+)*:([^;]*;){5}$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf
       ;;
     telephone)
-       egrep -xil "(TEL)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug
+       egrep -xil "(TEL)(;.+)*:.*$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf
       ;;
     birth)
-       egrep -xil "(BDAY)(;.+)*:$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf |debug
+       egrep -xil "(BDAY)(;.+)*:$_GET[\"filter\"].*" ${_DATA}/vcard/*vcf
       ;;
     course)
       ;;
@@ -134,7 +134,7 @@ vcf_parse() {
     case "$line" in
       key=*) echo -E "$line"
        ;;
-      value=*) echo -E "$line" |debug
+      value=*) echo -E "$line"
        ;;
       tag=*) ot=''
             echo -E "$line" \

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index c9adf7f9c8169b96ca487125826f183bd59c951a..1e02e3db017c1845f1a753927c91d73e8029ccbd 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -74,8 +74,11 @@ view_card_item() {
 }
 
 view_attendee() {  #Parameter: Cardfile
-  key=""
-  vcf_parse "$1" |while read -r line; do
+  cardfile="$1"
+  cachefile="cache/vcf_$(basename "$cardfile").cache"
+  unset key
+  [ "$cachefile" -nt "$cardfile" ] && cat "$cachefile" \
+  || vcf_parse "$cardfile" |while read -r line; do
     declare -A tag
     case "$line" in
       value*) eval "$line";;
@@ -91,5 +94,5 @@ view_attendee() {  #Parameter: Cardfile
         fi
       ;;
     esac
-  done
+  done |tee "$cachefile"
 }