[FEAT] query search to && bool (thx @np).

src/Gargantext/Database/TextSearch.hs

@@ -17,51 +17,72 @@ commentary with @some markup@.
 module Gargantext.Database.TextSearch where
 
 import Prelude (print)
-import Gargantext (connectGargandb)
+
+import Control.Monad
+
 import Data.Aeson
+import Data.List (intersperse)
+import Data.String (IsString(..))
+import Data.Text (Text, words)
+
 import Database.PostgreSQL.Simple
-import Control.Applicative
-import Control.Monad
-import Data.Text (Text)
+import Database.PostgreSQL.Simple.ToField
+
+import Gargantext (connectGargandb)
 import Gargantext.Prelude
 
+newtype TSQuery = UnsafeTSQuery [Text]
+
+instance IsString TSQuery
+  where
+    fromString = UnsafeTSQuery . words . cs
+
+
+instance ToField TSQuery
+  where
+    toField (UnsafeTSQuery xs)
+      = Many  $ intersperse (Plain " && ")
+              $ map (\q -> Many [ Plain "plainto_tsquery("
+                                , Escape (cs q)
+                                , Plain ")"
+                                ]
+                    ) xs
 
-type TextQuery= Text
 type ParentId = Int
 type Limit    = Int
 type Offset   = Int
+data Order    = Asc | Desc
 
-data Order = Asc | Desc
-
-toQuery :: Order -> Query
-toQuery Asc  = "ASC"
-toQuery Desc = "DESC"
+instance ToField Order
+  where
+    toField Asc  = Plain "ASC"
+    toField Desc = Plain "DESC"
 
 -- TODO
 -- FIX fav
 -- ADD ngrams count
 -- TESTS
-textSearchQuery :: Order -> Query
-textSearchQuery o = "SELECT n.id, n.hyperdata -> 'publication_date'   \
-\                   , n.hyperdata -> 'title'                          \
-\                   , n.hyperdata -> 'source'                         \
+textSearchQuery :: Query
+textSearchQuery = "SELECT n.id, n.hyperdata->'publication_date'   \
+\                   , n.hyperdata->'title'                          \
+\                   , n.hyperdata->'source'                         \
 \                   , COALESCE(nn.score,null)                         \
 \                      FROM nodes n                                   \
 \            LEFT JOIN nodes_nodes nn  ON nn.node2_id = n.id          \
 \              WHERE                                                  \
-\                n.title_abstract @@ to_tsquery(?)                    \
+\                n.title_abstract @@ (?::tsquery)                    \
 \                AND n.parent_id = ?   AND n.typename  = 4            \
-\                ORDER BY n.hyperdata -> 'publication_date' "
-      <> toQuery o <>  " offset ? limit ?;"
+\                ORDER BY n.hyperdata -> 'publication_date' ?         \
+\            offset ? limit ?;"
 
 
 textSearch :: Connection 
-           -> TextQuery -> ParentId
+           -> TSQuery -> ParentId
            -> Limit -> Offset -> Order
            -> IO [(Int,Value,Value,Value, Maybe Int)]
-textSearch conn q p l o ord = query conn (textSearchQuery ord) (q,p,o,l)
+textSearch conn q p l o ord = query conn textSearchQuery (q,p,ord, o,l)
 
-textSearchTest :: TextQuery -> IO ()
+textSearchTest :: TSQuery -> IO ()
 textSearchTest q = connectGargandb "gargantext.ini"
   >>= \conn -> textSearch conn q 421968 10 0 Asc
   >>= mapM_ print