From: Paul Hänsch <paul@plutz.net>
Date: Fri, 22 Sep 2023 15:50:03 +0000 (+0200)
Subject: themeable search page
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=35c700335c55a0819e3582a77211e3cb280f48fe;p=shellwiki

themeable search page
---

diff --git a/handlers/40_search.sh b/handlers/40_search.sh
index 823ef76..d198f22 100644
--- a/handlers/40_search.sh
+++ b/handlers/40_search.sh
@@ -42,16 +42,6 @@ done \
     [ "${page%/:*/}" = "${page%/:${LANGUAGE}/}" ] || continue
   fi
   acl_read "$page" || continue
-  printf '<li><a href="%s">%s</a></li>' "$(URL "$page")" "$(HTML "$page")"
+  printf '%s\n' "$page"
 done \
-| theme_page - <<-EOF
-	<article>
-	  <h1>$(_ "Search results")</h1>
-	  <form method=GET>
-            <input class="search" name="q" placeholder="$(_ Search)" value="$(HTML $words)"><button class="search" type="submit">$(_ Search)</button>
-	  </form>
-	  <ol class="searchresults">
-	    $(cat)
-	  </ol>
-	</article>
-	EOF
+| theme_search "${words%	}"
diff --git a/themes/default.sh b/themes/default.sh
index 85febee..5e38ee4 100755
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -131,6 +131,25 @@ theme_editor(){
 
 theme_revisions(){ theme_page "$@"; }
 
+theme_search(){
+  local words="$*"
+  # STDIN: read result pages line by line
+
+  theme_page - <<-EOF
+	<article>
+	  <h1>$([ "$words" ] && _ "Search results" || _ "Search" )</h1>
+	  <form method=GET>
+	    <input class="search" name="q" value="$(HTML $words)"><button class="search" type="submit">$(_ Search)</button>
+	  </form>
+	  <ol class="searchresults">
+	    $( while read p; do
+	      printf '<li><a href="%s">%s</a></li>' "$(URL "$p")" "$(HTML "$p")"
+	    done)
+	  </ol>
+	</article>
+	EOF
+}
+
 theme_attachments(){
   local page="$1" title
   title="${page%/}"; title="${title##*/}"