summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorYorhel <git@yorhel.nl>2020-07-19 10:39:14 +0200
committerYorhel <git@yorhel.nl>2020-07-19 10:39:17 +0200
commit2fd1910f7f6f1218f68c404d86b25a7831725b43 (patch)
tree5e5ee2e97dd96cfb6f0aa1003befeb040c1b99eb /lib
parentdcb875dd1ab06dd89006d01bf6a637b626753b80 (diff)
Ignore spaces in elm-autocompleted character & staff search
https://vndb.org/t2520.459
Diffstat (limited to 'lib')
-rw-r--r--lib/VNWeb/Chars/Elm.pm4
-rw-r--r--lib/VNWeb/Staff/Elm.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/VNWeb/Chars/Elm.pm b/lib/VNWeb/Chars/Elm.pm
index c995dc61..bdc37b35 100644
--- a/lib/VNWeb/Chars/Elm.pm
+++ b/lib/VNWeb/Chars/Elm.pm
@@ -11,8 +11,8 @@ elm_api Chars => undef, { search => {} }, sub {
FROM (SELECT MIN(prio), id FROM (',
sql_join('UNION ALL',
$q =~ /^$RE{cid}$/ ? sql('SELECT 1, id FROM chars WHERE id =', \"$+{id}") : (),
- sql('SELECT 1+substr_score(lower(name),' , \$qs, '), id FROM chars WHERE name ILIKE', \"%$qs%"),
- sql('SELECT 10+substr_score(lower(original),', \$qs, '), id FROM chars WHERE original ILIKE', \"%$qs%"),
+ sql('SELECT 1+substr_score(lower(name),' , \$qs, '), id FROM chars WHERE name ILIKE', \"%$qs%"),
+ sql('SELECT 10+substr_score(lower(original),', \$qs, "), id FROM chars WHERE translate(original,' ','') ILIKE", \("%$qs%" =~ s/ //gr)),
sql('SELECT 100, id FROM chars WHERE alias ILIKE', \"%$qs%"),
), ') x(prio,id) GROUP BY id) x(prio, id)
JOIN chars c ON c.id = x.id
diff --git a/lib/VNWeb/Staff/Elm.pm b/lib/VNWeb/Staff/Elm.pm
index da40f8a5..1a88b734 100644
--- a/lib/VNWeb/Staff/Elm.pm
+++ b/lib/VNWeb/Staff/Elm.pm
@@ -12,7 +12,7 @@ elm_api Staff => undef, { search => {} }, sub {
sql_join('UNION ALL',
$q =~ /^$RE{sid}$/ ? sql('SELECT 0, aid FROM staff_alias WHERE id =', \"$+{id}") : (),
sql('SELECT 1+substr_score(lower(name),', \$qs, ')+substr_score(lower(original),', \$qs, '), aid
- FROM staff_alias WHERE name ILIKE', \"%$qs%", 'OR original ILIKE', \"%$qs%"),
+ FROM staff_alias WHERE name ILIKE', \"%$qs%", "OR translate(original,' ','') ILIKE", \("%$qs%" =~ s/ //gr)),
), ') x(prio, aid)
JOIN staff_alias sa ON sa.aid = x.aid
JOIN staff s ON s.id = sa.id