web: show only one result after click on a word link

ilius · Oct 11, 2024 · 5ba5e6a · 5ba5e6a
1 parent 9a41521
commit 5ba5e6a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/pkg/application/query.go b/pkg/application/query.go
@@ -167,7 +167,7 @@ func onQuery(
  case 3:
  mode = dictmgr.QueryModeGlob
  }
- results := dictmgr.LookupHTML(query, conf, mode, resultFlags)
+ results := dictmgr.LookupHTML(query, conf, mode, resultFlags, 0)
  slog.Debug("LookupHTML running time", "dt", time.Since(t), "query", query)
  queryArgs.ResultList.SetResults(results)
  if len(results) == 0 {

diff --git a/pkg/dictmgr/lookup.go b/pkg/dictmgr/lookup.go
@@ -69,6 +69,7 @@ func LookupHTML(
  conf *config.Config,
  mode QueryMode,
  resultFlags uint32,
+ limit int,
 ) []common.SearchResultIface {
  results := []common.SearchResultIface{}
  for _, dic := range dicts.DictList {
@@ -104,9 +105,11 @@ func LookupHTML(
  // }
  return res1.EntryIndex() < res2.EntryIndex()
  })
- cutoff := conf.MaxResultsTotal
- if cutoff > 0 && len(results) > cutoff {
- results = results[:cutoff]
+ if limit == 0 {
+ limit = conf.MaxResultsTotal
+ }
+ if limit > 0 && len(results) > limit {
+ results = results[:limit]
  }
  return results
 }
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -6,6 +6,7 @@ import (
  "log/slog"
  "net/http"
  "os"
+ "strconv"
  "text/template"
  "time"
 
@@ -106,7 +107,22 @@ func query(w http.ResponseWriter, r *http.Request) {
  return
  }
 
- raw_results := dictmgr.LookupHTML(query, conf, mode, flags)
+ limit := 0
+ limitStr := r.FormValue("limit")
+ if limitStr != "" {
+ limitI64, err := strconv.ParseUint(limitStr, 10, 0)
+ if err != nil {
+ err := jsonEncoder.Encode(ErrorResponse{Error: "invalid limit"})
+ if err != nil {
+ slog.Error("error in jsonEncoder.Encode", "err", err)
+ }
+ w.WriteHeader(http.StatusBadRequest)
+ return
+ }
+ limit = int(limitI64)
+ }
+
+ raw_results := dictmgr.LookupHTML(query, conf, mode, flags, limit)
  // pass resultFlags to LookupHTML
  results := make([]Result, len(raw_results))
  for i, entry := range raw_results {

diff --git a/web/web/index.html b/web/web/index.html
@@ -131,14 +131,6 @@
  resultListElem <= ul
 
 
-def ajax_query(query, mode):
- ajax.post(
- "/query?query=" + query + "&mode=" + mode,
- cache=False,
- oncomplete=on_query_result,
- )
-
-
 def clear_results():
  resultListElem.clear()
  headerLabel.clear()
@@ -151,7 +143,11 @@
  if not input.value:
  clear_results()
  return
- ajax_query(input.value, modeInput.value)
+ ajax.post(
+ "/query?query=" + input.value + "&mode=" + modeInput.value,
+ cache=False,
+ oncomplete=on_query_result,
+ )
 
 
 def on_word_link_click(event):
@@ -163,7 +159,11 @@
  if target.startswith("bword://"):
  target = target[8:]
  input.value = target
- ajax_query(target, modeInput.value)
+ ajax.post(
+ "/query?query=" + target + "&mode=" + modeInput.value + "&limit=1",
+ cache=False,
+ oncomplete=on_query_result,
+ )
 
 
 def on_random_result(res):