remove search from wikiform macro

diff --git a/macros/search b/macros/search
index b3d06e85a86fbc33274b48b298b4af9b926bd48b..b60305068479eda05e2d36937ec06c6013a5f734 100755 (executable)
--- a/macros/search
+++ b/macros/search
@@ -25,7 +25,7 @@ I="$_DATA/index"
 _(){ printf %s\\n "$*"; }
 [ "${LANGUAGE}" -a -r "${_EXEC}/l10n/${LANGUAGE}.sh" ] && . "${_EXEC}/l10n/${LANGUAGE}.sh"
 
-show_form=true show_hits='' action=''
+show_form=true show_hits='' action='' query=''
 
 set -- "$@" --
 while [ $# -gt 0 ]; do case $1 in
@@ -41,6 +41,8 @@ while [ $# -gt 0 ]; do case $1 in
   *) set -- "$@" "$1"; shift 1;;
 esac; done
 
+[ $@ -gt 0 ] && query="$*" || query="$(GET q)"
+
 searchteaser() {
   local file="$1" words db3_data
   local w l nc nl hits mhits cont mcont
@@ -79,14 +81,18 @@ elif [ ! "$action" ]; then
 fi
 
 if [ "${show_form}" = true ]; then
-  printf '<form class="macro search" method="GET" action="%s">
-  <input type="search" placeholder="%s" name="q" value="%s"><button type="submit" class="search">%s</button>
-</form>' "$action" "$(_ Search)" "$([ "$show_hits" = true ] && GET q |HTML)" "$(_ Search)"
+  cat <<-EOF
+       <form class="macro search" method="GET" action="${action}">
+         <input type="search" placeholder="$(_ Search)" name="q"
+                value="$([ "$show_hits" = true ] && printf %s\\n "$query" |HTML)"
+         ><button type="submit" class="search">$(_ Search)</button>
+       </form>
+       EOF
 fi
 
 if [ "${show_hits}" = true ]; then
   { read tags; read ntags; read words; } <<-EOF
-       $(GET q | awk '
+       $(printf %s\\n "${query}" | awk '
        BEGIN { # Field separator FS should include punctuation, including Unicode Block U+2000 - U+206F
                if ( length("¡") == 1 )  # Utf-8 aware AWK
                FS = "([] \\t\\n\\r\"'\''()*+,./:;<=>?\\\\^_`{|}~[-]|%[0-9A-Fa-f]{2}|'"$(printf '[\342\200\200-\342\201\257]')"')+";

diff --git a/macros/wikiform b/macros/wikiform
index 257a22ed6e1ca430d62cdc627f7406f8d5078074..fe3dbd11a449b364bd218fce2f305207cd928fe3 100755 (executable)
--- a/macros/wikiform
+++ b/macros/wikiform
@@ -35,15 +35,4 @@ case $action in
   settings)
     w_user_update |"$_EXEC/cgilite/html-sh.sed"
     ;;
-  search)
-    if [ "$LANGUAGE_DEFAULT" ]; then
-      printf '<form class="search" method="GET" action="./:%s/[search]">
-        <input type="search" placeholder="%s" name="q" value=""><button type="submit" class="search">%s</button>
-      </form>' "$LANGUAGE" "$(_ Search)" "$(_ Search)"
-    else
-      printf '<form class="search" method="GET" action="./[search]">
-        <input type="search" placeholder="%s" name="q" value=""><button type="submit" class="search">%s</button>
-      </form>' "$(_ Search)" "$(_ Search)"
-    fi
-    ;;
 esac

diff --git a/pages/#page.md b/pages/#page.md
index 0a4ba307bd50cb9e929f9bd3a8690b3cbb642bff..ce03c129a231f5705906fb54fc4cfce275942835 100644 (file)
--- a/pages/#page.md
+++ b/pages/#page.md
@@ -5,7 +5,7 @@
 
 It Works!
 =========
-<<wikiform search>>
+<<search>>
 
 ::: {center}
 You have set up a lightweight website that you can fill with content as you like.

diff --git a/pages/:de/#page.md b/pages/:de/#page.md
index 6bc9b5d69e7a93e5f66aa96cbf8f8ef84a73e219..6c1e1ef5a675fe4bee176cd147f4e50e236b56d3 100644 (file)
--- a/pages/:de/#page.md
+++ b/pages/:de/#page.md
@@ -5,7 +5,7 @@
 
 Es Funktioniert!
 ================
-<<wikiform search>>
+<<search>>
 
 ::: {center}
 Sie haben eine leichtgewichtige Webseite eingerichtet, die Sie nach belieben mit Inhalten füllen können.

diff --git a/pages/[wiki]/header/#page.md b/pages/[wiki]/header/#page.md
index 8ecd0d9df59183f1f45abf36e9b39181c78985f2..1d9f629bd248394576ae051ea2ad7a1a91ba8594 100644 (file)
--- a/pages/[wiki]/header/#page.md
+++ b/pages/[wiki]/header/#page.md
@@ -4,7 +4,7 @@
 --------------
 
 ::: { right }
-<<wikiform search>>
+<<search>>
 :::
 ::: { menu }
  * [Help](/[wiki]/editorhelp/)

diff --git a/pages/[wiki]/header/:de/#page.md b/pages/[wiki]/header/:de/#page.md
index 85edc74351796b4c2ab57f37dd1cf3e1f8bb84bb..d94a55a141ec0cf65aface3533c709dcb3cbefc0 100644 (file)
--- a/pages/[wiki]/header/:de/#page.md
+++ b/pages/[wiki]/header/:de/#page.md
@@ -4,7 +4,7 @@
 --------------
 
 ::: { right }
-<<wikiform search>>
+<<search>>
 :::
 ::: { .menu }
  * [Hilfe](/[wiki]/editorhelp/)