allow running from sub directory of base location

[confetti] / cards / filter_card.sh

diff --git a/cards/filter_card.sh b/cards/filter_card.sh
index e7d1114a2deb3077c0bfe10584ed3dea044d4962..504fb08e5b78d0cb44c9c092732dfebf77aae1f5 100755 (executable)
--- a/cards/filter_card.sh
+++ b/cards/filter_card.sh
@@ -21,12 +21,18 @@ filter="$(
   seq 0 100 |while read n; do
     filter_type="$(POST "filter_type${n}")"
     filter_text="$(POST "filter_text${n}")"
-    [ ! "$filter_type" -a ! "$filter_text"  ] && break
-    if [ "$filter_type" = CATEGORIES ]; then
+    if [ ! "$filter_type" -a ! "$filter_text"  ]; then
+      break
+    elif [ "$filter_type" = CATEGORIES ]; then
       printf '^CATEGORIES:'
       seq 0 $(POST_COUNT filter_cat$n) |while read m; do
         printf '|%s' "$(POST filter_cat$n $m)"
       done
+    elif [ "$filter_type" = course ]; then
+      printf '^course:'
+      seq 0 $(POST_COUNT filter_course$n) |while read m; do
+        printf '|%s' "$(POST filter_course$n $m)"
+      done
     else
       printf '^%s:%s' "$filter_type" "$filter_text"
     fi
@@ -38,12 +44,15 @@ filter="$(
 
 case $(POST choice) in
   filter)
-    REDIRECT "/cards/?o=$(POST order)&f=${filter}"
+    REDIRECT "${_BASE}/cards/?o=$(POST order)&f=${filter}"
     ;;
   new_filter)
-    REDIRECT "/cards/?o=$(POST order)&f=${filter}&newfilter=yes"
+    REDIRECT "${_BASE}/cards/?o=$(POST order)&f=${filter}&newfilter=yes"
+    ;;
+  export_csv)
+    REDIRECT "${_BASE}/cards/export_csv.sh?o=$(POST order)&f=${filter}"
     ;;
   *)
-    REDIRECT '/cards/'
+    REDIRECT "${_BASE}/cards/"
     ;;
 esac