drop pasted card info from course functions

[confetti] / cards / filter_card.sh

diff --git a/cards/filter_card.sh b/cards/filter_card.sh
index d09adabc07cf5f23c8b9d5925cf296835f3cb09a..10ca51b8eb34a0ca26253960c608875cb9e69d32 100755 (executable)
--- a/cards/filter_card.sh
+++ b/cards/filter_card.sh
@@ -20,13 +20,23 @@
 if [ "$(POST choice)" = new_filter ]; then
   filter="$(
     seq 0 100 |while read n; do
-      printf %s "$(POST filter$n)"
+      filter_type="$(POST "filter_type${n}")"
+      filter_text="$(POST "filter_text${n}")"
+      [ ! "$filter_type" -a ! "$filter_text"  ] && break
+      if [ "$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
+      else
+        printf '^%s:%s' "$filter_type" "$filter_text"
+      fi
     done | sed -r \
            's;\|+;\|;g;   s;\^+;\^;g;   s;:\|;:;g;
             :X;   s;\^[^:]*:\^;\^;g;   /\^[^:]*:\^/bX;
             s;^\^;;;   s;\^[^:]*:$;;;'
   )"
-  REDIRECT "/cards/?order=$(POST order)&filter=${filter}"
+  REDIRECT "/cards/?o=$(POST order)&f=${filter}"
 else
   REDIRECT '/cards/'
 fi