codemicro/hn84
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

eeeeeee

Browse source
This commit is contained in:
akp 2023-11-05 11:37:35 +00:00
parent 30c921e57b
commit 5b0a4704b4
No known key found for this signature in database
GPG key ID: CF8D58F3DEB20755
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ui/internal/httpcore/httpcore.go
View file

@ -60,6 +60,10 @@ func (e *endpoints) search(ctx *fiber.Ctx) error {
return err return err
} }
if len(results) > 50 {
results = results[:50]
}
var resultNodes []g.Node var resultNodes []g.Node
conf := config.Get() conf := config.Get()
@ -82,6 +86,10 @@ func (e *endpoints) search(ctx *fiber.Ctx) error {
for _, tok := range res.Tokens { for _, tok := range res.Tokens {
if tok.Start >= startPos && tok.End <= endPos { if tok.Start >= startPos && tok.End <= endPos {
for i, ch := range plaintext[tok.Start : tok.End+1] { for i, ch := range plaintext[tok.Start : tok.End+1] {
pos := (tok.Start - startPos) + i
if pos >= len(x) {
continue
}
x[(tok.Start-startPos)+i] = html.B(g.Text(string(ch))) x[(tok.Start-startPos)+i] = html.B(g.Text(string(ch)))
} }
} }

5
ui/internal/search/search.go
View file

@ -2,6 +2,8 @@ package search
import ( import (
"context" "context"
"database/sql"
"errors"
"git.tdpain.net/codemicro/hn84/ui/internal/database" "git.tdpain.net/codemicro/hn84/ui/internal/database"
"git.tdpain.net/codemicro/hn84/util" "git.tdpain.net/codemicro/hn84/util"
"github.com/uptrace/bun" "github.com/uptrace/bun"
@ -80,6 +82,9 @@ func DoSearch(db *bun.DB, query []string) ([]*Match, error) {
for docID, tokens := range tokensByDocument { for docID, tokens := range tokensByDocument {
doc := new(database.Document) doc := new(database.Document)
if err := db.NewSelect().Model(doc).Where("id = ?", docID).Scan(context.Background(), doc); err != nil { if err := db.NewSelect().Model(doc).Where("id = ?", docID).Scan(context.Background(), doc); err != nil {
if errors.Is(err, sql.ErrNoRows) {
continue
}
return nil, util.Wrap("final assembly", err) return nil, util.Wrap("final assembly", err)
} }