fancier search results with teasers and page titles

diff --git a/handlers/40_search.sh b/handlers/40_search.sh
index 90840603cd6ec7e1881b197f92994d2bbd4e3882..a4d91a82a8fa5e0f3861bf48f93ce6ac6fb1060b 100644 (file)
--- a/handlers/40_search.sh
+++ b/handlers/40_search.sh
@@ -18,6 +18,7 @@
 [ "${PATH_INFO%\[search\]}" = "$PATH_INFO" ] && return 1
 
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/db23.sh"
 
 I="$_DATA/index"
 words="$( GET q | awk '
@@ -31,6 +32,37 @@ words="$( GET q | awk '
        { for (n = 1; n <= NF; n++) printf "%s  ", tolower($n); }
 ')"
 
+searchteaser() {
+  local file="$1" words db3_data
+  local w l nc nl hits mhits cont mcont
+  shift 1; words="$*"
+
+  for w in ${words}; do
+    grep -hiwnF "$w" "$file"
+  done \
+  | sort -t: -k1 -n \
+  | { nc=-1 hits=0 mhits=0
+    while read -r l; do
+      nl="$nc" nc="${l%%:*}"
+      if [ $nc -eq $nl ]; then
+        hits=$((hits + 1))
+      elif [ $nc -eq $((nl + 1 )) ]; then
+        hits=$((hits + 1))
+        cont="${cont}${BR}${l#*:}"
+      elif [ $hits -gt $mhits ]; then
+        mhits="$hits" mcont="$cont"
+        hits=1 cont="${l#*:}"
+      else
+        hits=1 cont="${l#*:}"
+      fi
+    done
+
+    [ $hits -gt $mhits ] \
+    && STRING "$cont" \
+    || STRING "$mcont"
+  }
+}
+
 for w in ${words}; do
   [ ! -f "$I/$w" ] && continue
 
@@ -57,6 +89,6 @@ done \
     [ "${page%/:*/}" = "${page%/:${LANGUAGE}/}" ] || continue
   fi
   acl_read "$page" || continue
-  printf '%s\n' "$page"
+  printf '%s   %s\n' "$doc" "$(searchteaser "$(mdfile "$page")" $words)"
 done \
 | theme_search "${words%       }"

diff --git a/themes/default.css b/themes/default.css
index d8a5b3159baaeafaf85ba66c3ae234daece12a25..323e7b4b9bdfb3a2214eef5be9df2b3d2da04a09 100644 (file)
--- a/themes/default.css
+++ b/themes/default.css
@@ -178,6 +178,14 @@ ul.searchresults, ol.searchresults {
   width: 100%; max-width: 540pt;
   text-align: center;
 }
+.searchresults li a {
+  display: block;
+}
+.searchresults li p {
+  display: inline-block;
+  margin: 0 auto .5em auto;
+  white-space: pre-line;
+}
 
 table {
   min-width: 50%;

diff --git a/themes/default.sh b/themes/default.sh
index 5b2f1edd55a261ec566e37820c122af0d8a08313..fefde75925b1907263214531b54b5d8ce38b6f81 100755 (executable)
--- a/themes/default.sh
+++ b/themes/default.sh
@@ -136,7 +136,7 @@ theme_revisions(){ theme_page "$@"; }
 
 theme_search(){
   local words="$*"
-  # STDIN: read result pages line by line
+  # STDIN: [STRING page][TAB][STRING teaser]
 
   theme_page - "$(_ Search results): ${words}" <<-EOF
        <article>
@@ -145,8 +145,14 @@ theme_search(){
            <input type="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")"
+           $(while read -r p t; do
+             path="$(UNSTRING "$p")" pfrag="${path%/}" title=''
+              while [ "$pfrag" ]; do
+                title="$(page_title "$pfrag")/$title"
+                pfrag="${pfrag%/*}"
+              done
+             printf '<li><a href="%s">%s</a><p>%s</p></li>' \
+                "$(URL "$path")" "$(HTML "/$title")" "$(UNSTRING "$t" |HTML)"
            done)
          </ol>
        </article>