Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

[serve0] / advsearch.sh

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