X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Ffilter_card.sh;h=aacacbb2b42033b4fded4f9da2a807107cdc7402;hp=183278ffb94e96a0be465edef66baf9a48d45f7d;hb=047067c2f45ea5ba54ad972a19d9682b36dfd347;hpb=85ff3b292b0775165a0b889b3714151f135bf84c diff --git a/cards/filter_card.sh b/cards/filter_card.sh index 183278f..aacacbb 100755 --- a/cards/filter_card.sh +++ b/cards/filter_card.sh @@ -21,16 +21,22 @@ 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 - done | sed -r \ + done | sed -E \ 's;\|+;\|;g; s;\^+;\^;g; s;:\|;:;g; :X; s;\^[^:]*:\^;\^;g; /\^[^:]*:\^/bX; s;^\^;;; s;\^[^:]*:$;;;' @@ -43,6 +49,9 @@ case $(POST choice) in new_filter) REDIRECT "/cards/?o=$(POST order)&f=${filter}&newfilter=yes" ;; + export_csv) + REDIRECT "/cards/export_csv.sh?o=$(POST order)&f=${filter}" + ;; *) REDIRECT '/cards/' ;;