optical preparation for vcard display

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index 45602fcfc2895ab1785759c56afbe622766f8e8a..327135f8f21529e9cb029bba29b530e3a22a5ad8 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -6,13 +6,15 @@ die() {
   exit 1
 }
 debug() { #change to false to disable debugging
   exit 1
 }
 debug() { #change to false to disable debugging

-  true && echo "$*" >>debug
+  #true && echo "$*" >>debug
+  true && [ -n "$*" ] && echo "$*" >>/dev/stderr
+  true && [ -z "$*" ] && tee /dev/stderr

 }
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
 # programs from the directory in which the real executable resides
 }
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
 # programs from the directory in which the real executable resides

-# therefore we need to identify the code and data directories _EXEC and _STOR
+# therefore we need to identify the code and data directories _EXEC and _DATA

 call=$0
 real=$call
 while [ -L "$real" ]; do
 call=$0
 real=$call
 while [ -L "$real" ]; do


@@ -20,15 +22,15 @@ while [ -L "$real" ]; do
 done
 
 _EXEC="$(dirname "$real")"  #execution directory
 done
 
 _EXEC="$(dirname "$real")"  #execution directory

-_STOR="$(dirname "$call")"  #storage directory
+_DATA="$(dirname "$call")"  #storage directory

 
 debug "Execution dir: $_EXEC"
 
 debug "Execution dir: $_EXEC"

-debug "Storage dir: $_STOR"
+debug "Storage dir: $_DATA"

 
 

-[ -w "$_EXEC" ] && [ -d "$_EXEC" ] || die "storage directory must be writable"
+[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"

 
 # create directories for object storage
 
 # create directories for object storage

-for each in "$_STOR"/{vcard,mappings,courses}; do
+for each in "$_DATA"/{vcard,mappings,courses}; do

   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done


@@ -46,3 +48,4 @@ EOF
 cgi_get
 debug "$_GET"
 
 cgi_get
 debug "$_GET"
 

+. "$_EXEC/page.sh"