Browse Source

fix spaced quotes causing weird behavior in search.

master 2.2.1
Gisle Aune 4 years ago
parent
commit
33ac47a12c
  1. 26
      database/postgres/utils.go
  2. 1
      database/postgres/utils_test.go

26
database/postgres/utils.go

@ -17,28 +17,34 @@ func TSQueryFromSearch(search string) string {
startQuotes := false startQuotes := false
if strings.HasPrefix(token, "\"") { if strings.HasPrefix(token, "\"") {
token = token[1:]
if len(token) > 1 {
token = token[1:]
}
startQuotes = true startQuotes = true
} }
if strings.HasSuffix(token, "\"") { if strings.HasSuffix(token, "\"") {
token = token[:len(token)-1] token = token[:len(token)-1]
startQuotes = false
clearQuotes = true clearQuotes = true
} }
if startQuotes {
if i > 0 {
token := strings.Trim(token, ",.;:()\"")
if len(token) > 0 {
if startQuotes {
if i > 0 {
result += " & "
}
result += "("
} else if inQuotes {
result += "<->"
} else if i != 0 {
result += " & " result += " & "
} }
result += "("
} else if inQuotes {
result += "<->"
} else if i != 0 {
result += " & "
result += token
} }
result += token
if startQuotes { if startQuotes {
inQuotes = true inQuotes = true
} }

1
database/postgres/utils_test.go

@ -13,6 +13,7 @@ func TestTSQueryFromSearch(t *testing.T) {
{`"asari matron" blue`, `(asari<->matron) & blue`}, {`"asari matron" blue`, `(asari<->matron) & blue`},
{`"christmas present" "wrapping paper"`, `(christmas<->present) & (wrapping<->paper)`}, {`"christmas present" "wrapping paper"`, `(christmas<->present) & (wrapping<->paper)`},
{`stuff`, `stuff`}, {`stuff`, `stuff`},
{`"her slowly, rubbing the back of his head awkwardly. "`, `(her<->slowly<->rubbing<->the<->back<->of<->his<->head<->awkwardly)`},
} }
for i, row := range rows { for i, row := range rows {

Loading…
Cancel
Save