Search adjustments + use new search for producers,staff,characters too

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/Multi/API.pm b/lib/Multi/API.pm
index 866de1ce..24a8a0ee 100644
--- a/lib/Multi/API.pm
+++ b/lib/Multi/API.pm
@@ -817,7 +817,7 @@ my %GET_PRODUCER = (
       [ stra  => 'p.lang :op:(:value:)', {'=' => 'IN', '!=' => 'NOT IN'}, join => ',', process => \'lang' ],
     ],
     search => [
-      [ str   => '(p.name ILIKE :value: OR p.original ILIKE :value: OR p.alias ILIKE :value:)', {'~',1}, process => \'like' ],
+      [ str   => 'p.c_search LIKE ALL (search_query(:value:))', {'~',1} ],
     ],
   },
 );
@@ -928,7 +928,7 @@ my %GET_CHARACTER = (
       [ str   => 'c.original ILIKE :value:', {'~',1}, process => \'like' ]
     ],
     search => [
-      [ str   => '(c.name ILIKE :value: OR c.original ILIKE :value: OR c.alias ILIKE :value:)', {'~',1}, process => \'like' ],
+      [ str   => 'c.c_search LIKE ALL (search_query(:value:))', {'~',1} ],
     ],
     vn => [
       [ 'int' => 'c.id IN(SELECT cv.id FROM chars_vns cv WHERE cv.vid = :value:)', {'=',1}, process => \'v' ],
@@ -1033,7 +1033,7 @@ my %GET_STAFF = (
       [ inta  => 's.id IN(SELECT sa.id FROM staff_alias sa WHERE sa.aid IN(:value:))', {'=',1}, range => [1,1e6], join => ',' ],
     ],
     search => [
-      [ str   => 's.id IN(SELECT sa.id FROM staff_alias sa WHERE sa.name ILIKE :value: OR sa.original ILIKE :value:)', {'~',1}, process => \'like' ],
+      [ str   => 's.id IN(SELECT sa.id FROM staff_alias sa WHERE sa.c_search LIKE ALL (search_query(:value:)))', {'~',1} ],
     ],
   },
 );
diff --git a/lib/Multi/IRC.pm b/lib/Multi/IRC.pm
index 245603a2..4ef26ec1 100644
--- a/lib/Multi/IRC.pm
+++ b/lib/Multi/IRC.pm
@@ -393,10 +393,10 @@ p => [ 0, 0, sub {
   pg_cmd q{
     SELECT id, name AS title
     FROM producers p
-    WHERE hidden = FALSE AND (name ILIKE $1 OR original ILIKE $1 OR alias ILIKE $1)
+    WHERE hidden = FALSE AND c_search LIKE ALL (search_query($1))
     ORDER BY name
     LIMIT 6
-  }, [ "%$q%" ], sub {
+  }, [ $q ], sub {
     my $res = shift;
     return if pg_expect $res, 1;
     return $irc->send_msg(PRIVMSG => $chan, 'No producers novels found.') if !$res->nRows;