From 8061a2f108fbbbd3b0419770d6630993800da60e Mon Sep 17 00:00:00 2001 From: onee-only Date: Mon, 4 Mar 2024 12:55:59 +0900 Subject: Remove duplicate code --- src/pattern.go | 3 +-- src/server.go | 14 ++++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/pattern.go b/src/pattern.go index 95f23556..bf92ca19 100644 --- a/src/pattern.go +++ b/src/pattern.go @@ -209,11 +209,10 @@ func parseTerms(fuzzy bool, caseMode Case, normalize bool, str string) []termSet // Flip exactness if fuzzy && !inv { typ = termExact - text = text[1:] } else { typ = termFuzzy - text = text[1:] } + text = text[1:] } else if strings.HasPrefix(text, "^") { if typ == termSuffix { typ = termEqual diff --git a/src/server.go b/src/server.go index d5a148df..03fe78f3 100644 --- a/src/server.go +++ b/src/server.go @@ -236,17 +236,15 @@ func parseGetParams(query string) getParams { for _, pair := range strings.Split(query, "&") { parts := strings.SplitN(pair, "=", 2) if len(parts) == 2 { + val, err := strconv.Atoi(parts[1]) + if err != nil { + continue + } switch parts[0] { case "limit": - val, err := strconv.Atoi(parts[1]) - if err == nil { - params.limit = val - } + params.limit = val case "offset": - val, err := strconv.Atoi(parts[1]) - if err == nil { - params.offset = val - } + params.offset = val } } } -- cgit v1.2.3