Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Router returns max 400chars for description #131

Merged
merged 4 commits into from
Oct 25, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/bucket/result/result.go
Original file line number Diff line number Diff line change
@@ -17,3 +17,21 @@ type Result struct {
TimesReturned uint8
Response *colly.Response
}

func firstN(str string, n int) string {
v := []rune(str)
if n >= len(v) {
return str
}
return string(v[:n])
}

func Shorten(results []Result) []Result {
resultsShort := make([]Result, len(results))
copy(resultsShort, results)
for i := range resultsShort {
descShort := firstN(resultsShort[i].Description, 400)
resultsShort[i].Description = descShort
}
return resultsShort
}
61 changes: 33 additions & 28 deletions src/router/search.go
Original file line number Diff line number Diff line change
@@ -33,37 +33,42 @@ func Search(c *gin.Context, config *config.Config, db cache.DB) {
}
}

maxPages, err := strconv.Atoi(pages)
if err != nil {
log.Error().Err(err).Msgf("cannot convert \"%v\" to int, reverting to default value of 1", pages)
maxPages = 1
}
if query == "" {
c.String(http.StatusOK, "")
} else {
maxPages, err := strconv.Atoi(pages)
if err != nil {
log.Error().Err(err).Msgf("cannot convert \"%v\" to int, reverting to default value of 1", pages)
maxPages = 1
}

visitPages := false
if deepSearch != "false" {
log.Trace().Msgf("doing a deep search because deep is: %v", deepSearch)
visitPages = true
}
visitPages := false
if deepSearch != "false" {
log.Trace().Msgf("doing a deep search because deep is: %v", deepSearch)
visitPages = true
}

options := engines.Options{
MaxPages: maxPages,
VisitPages: visitPages,
}
options := engines.Options{
MaxPages: maxPages,
VisitPages: visitPages,
}

var results []result.Result
db.Get(query, &results)
if results != nil {
log.Debug().Msgf("Found results for query (%v) in cache", query)
} else {
log.Debug().Msg("Nothing found in cache, doing a clean search")
results = search.PerformSearch(query, options, config)
defer db.Set(query, results)
}
var results []result.Result
db.Get(query, &results)
if results != nil {
log.Debug().Msgf("Found results for query (%v) in cache", query)
} else {
log.Debug().Msg("Nothing found in cache, doing a clean search")
results = search.PerformSearch(query, options, config)
defer db.Set(query, results)
}

if resultsJson, err := json.Marshal(results); err != nil {
log.Error().Err(err).Msg("failed marshalling results")
c.String(http.StatusInternalServerError, "")
} else {
c.String(http.StatusOK, string(resultsJson))
resultsShort := result.Shorten(results)
if resultsJson, err := json.Marshal(resultsShort); err != nil {
log.Error().Err(err).Msg("failed marshalling results")
c.String(http.StatusInternalServerError, "")
} else {
c.String(http.StatusOK, string(resultsJson))
}
}
}