include shortcuts to bookmarks into filter list

diff --git a/advsearch.sh b/advsearch.sh
index 24d31c9497d8406cd9747d1c18f1ba0186de6a47..227a3b4ba221cb7895a9712192ae100ca1f2230a 100755 (executable)
--- a/advsearch.sh
+++ b/advsearch.sh
@@ -16,6 +16,11 @@ for n in 1 2 3 4 5 6 7 8 9 10; do
   f="${f%[|^]}^"
 done
 f="$(printf '%s' "$f" |sed -E 's;[~|^]+$;;; s;\|\^;^;g;')"
+n=1; while tag="$(POST "bookmark" $n)"; do
+  f="${f}^${tag}"
+  n=$((n + 1))
+done
+
 #f="${f%^}"
 
 REDIRECT "$(URL "${ITEM}")?o=${order}&f=${f}"

diff --git a/widgets.sh b/widgets.sh
index 35058cba7374387a59553164337e3cff7425cc08..3de96f6c299351b9889439f5aacf54013a7c089e 100755 (executable)
--- a/widgets.sh
+++ b/widgets.sh
@@ -158,6 +158,7 @@ w_index(){
 
 w_advsearch(){
   local n lbid tag category filter f t d
+  local bm="$_DATA/.index/bookmarks" name='' search=''
   filter="$(HTML "${FILTER}^")"
 
   printf '[form #advsearch action=./?a=advsearch method=POST
@@ -216,6 +217,18 @@ w_advsearch(){
     printf ']'
   done
 
+  printf '[fieldset and Bookmark:'
+  sort "$bm" |while read -r name search filter; do
+    search="${search#search=}" filter="${filter#filter=}" filter="${filter%${CR}}"
+    [ "$search" = "${w_str_s}" -a "$filter" = "${w_str_f}" ] && continue
+
+    name="$(UNSTRING "$name")";
+    search="$(UNSTRING "${search}" |URL)";
+    filter="$(UNSTRING "${filter}" |URL)";
+    printf '[label [checkbox "bookmark" "%s"] %s]' "$filter${search:+^\$:}${search}" "$name"
+  done
+  printf ']'
+
   printf \
    '[fieldset .submit [select name=order
       [option disabled=disabled Order By]