feat: offer to show all results on one page (if < 10000) Implements: https://todo.sr.ht/~alanpearce/searchix/5
1 file changed, 11 insertions(+), 14 deletions(-)
changed files
M internal/server/mux.go → internal/server/mux.go
@@ -110,10 +110,14 @@ var pageSize int = search.DefaultPageSize var pageNumber = 1 if pg := r.URL.Query().Get("page"); pg != "" { pageNumber, err = strconv.Atoi(pg) - if err != nil || pageNumber <= 0 || pageNumber > math.MaxInt { + if err != nil || pageNumber > math.MaxInt { errorHandler(w, r, "Bad query string", http.StatusBadRequest) return + } + if pageNumber == 0 { + pageNumber = 1 + pageSize = math.MaxInt } } page := pagination.New(pageNumber, pageSize)@@ -129,6 +133,9 @@ errorHandler(w, r, err.Error(), http.StatusInternalServerError) return } + if pageSize == math.MaxInt && results.Total > config.MaxResultsShowAll { + errorHandler(w, r, "Too many results, use pagination", http.StatusBadRequest) + } tdata := components.ResultData{ TemplateData: components.TemplateData{@@ -143,19 +150,6 @@ Results: results, } page.SetResults(results.Total) - log.Debug( - "pag", - "needed", - page.Needed, - "current", - page.Current, - "total", - results.Total, - "next", - page.Next, - "prev", - page.Prev, - ) if page.Needed { q, err := url.ParseQuery(r.URL.RawQuery) if err != nil {@@ -177,6 +171,9 @@ q.Set("page", strconv.Itoa(page.Prev)) } tdata.Prev = "search?" + q.Encode() } + + q.Set("page", "0") + tdata.All = "search?" + q.Encode() } w.Header().Add("Cache-Control", "max-age=300")