X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=advsearch.sh;h=e21340f7e511aa8c92884149920fb90292204f27;hb=b1ed234e9aef333270a969676a1bce8aaf4be730;hp=38cb17023f453160043e99e52eed6bc2ff7610c5;hpb=0a576d1d2ce23eb3043adcd7adb7b45c89ba6051;p=serve0

diff --git a/advsearch.sh b/advsearch.sh
index 38cb170..e21340f 100644
--- a/advsearch.sh
+++ b/advsearch.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 f=''
-order="$(POST order |grep -m1 -xE 'Name|Date|Length' || printf Name)"
+order="$(POST order |grep -m1 -xE 'Name|Date|Length|Group' || printf Name)"
 
 for n in 1 2 3 4 5 6 7 8 9; do
   [ "$(POST pol_$n)" = neg ] \
@@ -9,11 +9,13 @@ for n in 1 2 3 4 5 6 7 8 9; do
   cat="$(POST cat_$n)"
   for m in $(seq 1 $(POST_COUNT tag_$n)); do
     tag="$(POST tag_$n $m)"
-    [ ! "${tag##${cat}:*}" ] || [ "$cat" = '*' -a "${tag##*:*}" ] \
+    [ ! "${tag##${cat}:*}" ] || [ ! "${tag##-${cat}:*}" ] || [ "$cat" = '*' -a "${tag##*:*}" ] \
     && f="${f}${tag}|"
+    [ "$cat" = \$ ] && f="${f}\$:${tag}|"
   done
   f="${f%[|^]}^"
 done
-f="${f%^}"
+f="$(printf '%s' "$f" |sed -E 's;[~|^]+$;;; s;\|\^;^;g;')"
+#f="${f%^}"
 
 REDIRECT "$(URL "${ITEM}")?o=${order}&f=${f}"