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

diff --git a/advsearch.sh b/advsearch.sh
old mode 100644
new mode 100755
index 6f85ed2..24d31c9
--- a/advsearch.sh
+++ b/advsearch.sh
@@ -1,20 +1,21 @@
 #!/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
+for n in 1 2 3 4 5 6 7 8 9 10; do
   [ "$(POST pol_$n)" = neg ] \
   && f="$f~"
   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}"