implemented search queries, some speedup, caching

[bookman] / index.cgi

diff --git a/index.cgi b/index.cgi
index 00006da66746bf8dd3121a10175ed3c2f3021989..98e6719e4f9edbe986d984716c9ac3a146906096 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -160,10 +160,7 @@ case "$(GET action)" in
     fid="$(POST fid | checkid)"
     file="${BDB}/${fid}.bm"
     if [ "$(POST control)" = confirm -a -n "$name" -a -f "$file" ]; then
-      order="$(head -n1 "$file" |cut -f3 || printf 1000)"
-      printf '%s\t%s\t%s\n' "$fid" "$(HTML "$name")" "$order" >"${file%.bm}.tmp"
-      tail -n+2 "$file" >>"${file%.bm}.tmp"
-      mv "${file%.bm}.tmp" "$file"
+      sed -ri "1s'^(${fid}\t)[^\t]+(\t.+)$'\1${name}\2';" "$file"
     fi
     REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
@@ -201,7 +198,7 @@ case "$(GET action)" in
     file="${BDB}/${fid}.bm"
     bid="$(timeid)"
     if [ -n "$name" -a -f "${file}" ]; then
-      printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$(HTML "$url")" >>"${file}"
+      printf '%s\t%s\t%s\n' "$bid" "$(HTML "$name")" "$url" >>"${file}"
     fi
     getFavicon "$url" "$bid"
     REDIRECT "${SCRIPT_NAME}#${fid}"
@@ -212,8 +209,7 @@ case "$(GET action)" in
     url="$(POST url |head -n1)"
     file="$(grep -lm1 "^${bid}" "${BDB}"/????????????.bm |head -n1)"
     if [ -n "$name" -a -n "$url" -a "$(POST control)" = confirm -a -w "$file" ]; then
-      bm="$(printf '%s\t%s\t%s' "$bid" "$(HTML "$name")" "$(HTML "$url")" |sed -r 's;[\&\;];\\&;g;')"
-      sed -ri "s;^${bid}\t.*$;${bm};" "$file"
+      sed -rni "/^${bid}\t/!p; /^${bid}\t/i${bid}\t$(HTML "$name")\t${url}" "$file"
     fi
     getFavicon "$url" "$bid"
     REDIRECT "${SCRIPT_NAME}#${fid}"
@@ -250,6 +246,19 @@ case "$(GET action)" in
     fi
     REDIRECT "${SCRIPT_NAME}#${fid}"
     ;;
+  query)
+    fid="$(POST fid |checkid)"
+    bid="$(POST bid |checkid)"
+    file="${BDB}/${fid}.bm"
+    query="$(URL "$(POST query)")"
+
+
+    url="$(grep -m1 "^${bid}" "$file" |cut -f3-)"
+    urlpfx="${url%\{@\}*}"
+    urlsfx="${url#*\{@\}}"
+
+    REDIRECT "${urlpfx}${query}${urlsfx}"
+    ;;
 esac
 
 bookmarkmod(){
@@ -270,7 +279,7 @@ bookmarkmod(){
          <label>Name:</label>
          <input type="text" name="name" value="${name}")" placeholder="Name" />
          <label>URL:</label>
-         <input type="text" name="url"  value="${url}")" placeholder="URL" />
+         <input type="text" name="url"  value="$(HTML "${url}")")" placeholder="URL" />
          <button type="submit" name="control" value="confirm">OK</button>
          <button type="submit" name="control" value="cancel">Cancel</button>
        </form>
@@ -303,14 +312,27 @@ show_bookmarks(){
 
   tail -n+2 "${BDB}/${fid}.bm" \
   | while read bid name url; do
-    cat <<-EOF
+    if [ "${url%\{@\}*}" = "${url}" ]; then
+      cat <<-EOF
        <div class="bookmark">
          <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
-         <a class="link" href="${url}")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
+         <a class="link" target="_blank" href="$(HTML "${url}")")"><img src="${BDB}/favicons/${bid}.ico"/>${name}</a>
          <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
          <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</a>
        </div>
        EOF
+    else
+      cat <<-EOF
+       <form class="bookmark" target="_blank" method="POST" action="${SCRIPT_NAME}?action=query">
+         <a class="modify" href="${SCRIPT_NAME}?bmodify=${bid}">Modify</a>
+         <input type="hidden" name="fid" value="$fid" />
+         <input type="hidden" name="bid" value="$bid" />
+         <img src="${BDB}/favicons/${bid}.ico"/><input name="query" placeholder="$name"/>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmup&fid=${fid}&bid=${bid}">move left</a>
+         <a class="bmove" href="${SCRIPT_NAME}?action=bmdn&fid=${fid}&bid=${bid}">move right</a>
+       </form>
+       EOF
+    fi
   done
 }
 
@@ -378,7 +400,12 @@ foldermod(){
 show_folders(){
   list_folders \
   | while read fid fname order; do
-    cat <<-EOF
+    file="${BDB}/${fid}.bm"
+    cache="${BDB}/${fid}.cache"
+    if [ "${cache}" -nt "${file}" ]; then
+      cat "$cache"
+    else
+      tee "$cache" <<-EOF
        <section class="folder" id="${fid}">
          <h1>${fname}</h1>
          <a class="modify" href="${SCRIPT_NAME}?fmodify=${fid}">Modify</a>
@@ -391,6 +418,7 @@ show_folders(){
           </form>
        </section>
        EOF
+    fi
   done
 }