Merge branch 'master' of git.plutz.net:serve0

[serve0] / advsearch.sh

diff --git a/advsearch.sh b/advsearch.sh
index 3a2f33389fc54180bfc6f48dadee482d2a15c458..e21340f7e511aa8c92884149920fb90292204f27 100644 (file)
--- a/advsearch.sh
+++ b/advsearch.sh
@@ -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}"