regex fixes

svn path=/trunk/; revision=62

diff --git a/pages/filter.sh b/pages/filter.sh
index c19589be1c8626a9cd0d9fcddcbcead4a1acebc8..9f7483c5712f52fc63d993bf3a98d6f26d974539 100755 (executable)
--- a/pages/filter.sh
+++ b/pages/filter.sh
@@ -19,7 +19,7 @@
 
 . $_EXEC/pages/common.sh
 
-filters="$(echo -E "$_GET[\"f\"]" |sed -r 's;^!r*\^*;;; s;\^*!*$;;; s;!+;!;g; s;\^+;^;g')"
+filters="$(echo -E "$_GET[\"f\"]" |sed -r 's;^!*\^*;;; s;\^*!*$;;; s;!+;!;g; s;\^+;^;g')"
 debug "FILTERS: $filters"
 
 case "$1" in

diff --git a/templates/filter.html.sh b/templates/filter.html.sh
index 368591e54f29d578aeb70f1aef4b2cf3401ebc61..86d5b2b16bb79fbd6add2e5428a1f1cbc4eae29c 100755 (executable)
--- a/templates/filter.html.sh
+++ b/templates/filter.html.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 Paul Hänsch
+# Copyright 2014,2015 Paul Hänsch
 #
 # This file is part of Serve0
 # 
@@ -34,7 +34,7 @@ cat <<EOF
     <p class="help">Up to <strong>10</strong> filter boxes will appear as you start selecting tags. You can select <strong>multiple</strong> tags in each box by holding down the <strong>Ctrl</strong>-key. Click the "<strong>Filter!</strong>" button when you are ready.</p>
 
   $(for n in {0..9}; do
-    filter="$(echo -E "$filters" |cut -d^ -f$(($n+1)))"
+    filter="$(printf '%s^' "$filters" |cut -d^ -f$(($n+1)))"
     fneg="${filter%%[a-zA-Z]*}"
     filter="${filter#!}"
     fcat="${filter%%:*}"