X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=advsearch.sh;h=e21340f7e511aa8c92884149920fb90292204f27;hb=b1ed234e9aef333270a969676a1bce8aaf4be730;hp=6f85ed2c08d7e80dbb12b7cadb39cb3e486aa10e;hpb=36a7062732ede1219d99b3270a95fcd75df6eeea;p=serve0

diff --git a/advsearch.sh b/advsearch.sh
index 6f85ed2..e21340f 100644
--- a/advsearch.sh
+++ b/advsearch.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 f=''
-ref="$(POST ref)"
-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 ] \
@@ -10,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 "${ref%%\?*}?o=${order}&f=${f}"
+REDIRECT "$(URL "${ITEM}")?o=${order}&f=${f}"