Commit 168d6ce6 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FIX] warnings

parent 25f2808e
...@@ -24,7 +24,6 @@ import Data.Text (Text, toLower) ...@@ -24,7 +24,6 @@ import Data.Text (Text, toLower)
import Database.PostgreSQL.Simple.SqlQQ (sql) import Database.PostgreSQL.Simple.SqlQQ (sql)
import Gargantext.Core.Types (TableResult(..)) import Gargantext.Core.Types (TableResult(..))
import Gargantext.Database import Gargantext.Database
import Gargantext.Database.Action.Flow.Utils
import Gargantext.Database.Admin.Types.Hyperdata -- (HyperdataContact(..)) import Gargantext.Database.Admin.Types.Hyperdata -- (HyperdataContact(..))
import Gargantext.Database.Admin.Types.Node -- (AnnuaireId, CorpusId, ListId, DocId, ContactId, NodeId) import Gargantext.Database.Admin.Types.Node -- (AnnuaireId, CorpusId, ListId, DocId, ContactId, NodeId)
import Gargantext.Database.Prelude (Cmd, runPGSQuery) import Gargantext.Database.Prelude (Cmd, runPGSQuery)
...@@ -34,7 +33,6 @@ import Gargantext.Database.Schema.Node ...@@ -34,7 +33,6 @@ import Gargantext.Database.Schema.Node
import Gargantext.Prelude hiding (sum) import Gargantext.Prelude hiding (sum)
import Safe (lastMay) import Safe (lastMay)
import qualified Data.List as List import qualified Data.List as List
import qualified Data.Map as DM
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Text as DT import qualified Data.Text as DT
import qualified Data.Set as Set import qualified Data.Set as Set
...@@ -151,7 +149,7 @@ align mc ma md = fromListWith (<>) ...@@ -151,7 +149,7 @@ align mc ma md = fromListWith (<>)
fusion :: Map ContactName (Set ContactId) fusion :: Map ContactName (Set ContactId)
-> Map ContactName (Set DocId) -> Map ContactName (Set DocId)
-> Map ContactId (Set DocId) -> Map ContactId (Set DocId)
fusion mc md = undefined fusion _mc _md = undefined
{- fromListWith (<>) {- fromListWith (<>)
$ catMaybes $ catMaybes
$ map (\c -> case Map.lookup c mc of $ map (\c -> case Map.lookup c mc of
...@@ -179,10 +177,10 @@ getNgramsDocId :: CorpusId ...@@ -179,10 +177,10 @@ getNgramsDocId :: CorpusId
-> ListId -> ListId
-> NgramsType -> NgramsType
-> Cmd err (Map DocAuthor (Set NodeId)) -> Cmd err (Map DocAuthor (Set NodeId))
getNgramsDocId corpusId listId ngramsType getNgramsDocId corpusId listId nt
= fromListWith (<>) = fromListWith (<>)
<$> map (\(t,nId) -> (t, Set.singleton (NodeId nId))) <$> map (\(t,nId) -> (t, Set.singleton (NodeId nId)))
<$> selectNgramsDocId corpusId listId ngramsType <$> selectNgramsDocId corpusId listId nt
selectNgramsDocId :: CorpusId selectNgramsDocId :: CorpusId
......
...@@ -15,32 +15,28 @@ module Gargantext.Database.Action.Search where ...@@ -15,32 +15,28 @@ module Gargantext.Database.Action.Search where
import Control.Arrow (returnA) import Control.Arrow (returnA)
import Control.Lens ((^.)) import Control.Lens ((^.))
import Data.Aeson import Data.Aeson
import Data.List (intersperse, take, drop) import Data.List (intersperse)
import Data.Map.Strict hiding (map, drop, take)
import Data.Maybe import Data.Maybe
import Data.String (IsString(..)) import Data.String (IsString(..))
import Data.Text (Text, words, unpack, intercalate) import Data.Text (Text, words, unpack, intercalate)
import Data.Time (UTCTime) import Data.Time (UTCTime)
import Database.PostgreSQL.Simple (Query) import Database.PostgreSQL.Simple (Query)
import Database.PostgreSQL.Simple.ToField import Database.PostgreSQL.Simple.ToField
import Opaleye hiding (Query, Order)
import qualified Opaleye as O hiding (Order)
import Gargantext.Core.Types import Gargantext.Core.Types
import Gargantext.Database.Query.Filter
import Gargantext.Database.Admin.Config (nodeTypeId) import Gargantext.Database.Admin.Config (nodeTypeId)
import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..), HyperdataContact(..)) import Gargantext.Database.Admin.Types.Hyperdata (HyperdataDocument(..), HyperdataContact(..))
import Gargantext.Database.Admin.Types.Node (NodeType(..)) import Gargantext.Database.Admin.Types.Node (NodeType(..))
import Gargantext.Database.Prelude (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
import Gargantext.Database.Query.Facet import Gargantext.Database.Query.Facet
import Gargantext.Database.Query.Join (leftJoin6, leftJoin5) import Gargantext.Database.Query.Filter
import Gargantext.Database.Query.Join (leftJoin5)
import Gargantext.Database.Query.Table.Node import Gargantext.Database.Query.Table.Node
import Gargantext.Database.Query.Table.NodeNode import Gargantext.Database.Query.Table.NodeNode
import Gargantext.Database.Query.Table.NodeNodeNgrams
import Gargantext.Database.Query.Table.Ngrams
import Gargantext.Database.Prelude (Cmd, runPGSQuery, runOpaQuery, runCountOpaQuery)
import Gargantext.Database.Schema.Node import Gargantext.Database.Schema.Node
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Text.Terms.Mono.Stem.En (stemIt) import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
import Opaleye hiding (Query, Order)
import qualified Opaleye as O hiding (Order)
------------------------------------------------------------------------ ------------------------------------------------------------------------
searchDocInDatabase :: ParentId searchDocInDatabase :: ParentId
...@@ -129,7 +125,7 @@ selectContactViaDoc ...@@ -129,7 +125,7 @@ selectContactViaDoc
-> Text -> Text
-> O.Query FacetPairedReadNull -> O.Query FacetPairedReadNull
selectContactViaDoc cId aId q = proc () -> do selectContactViaDoc cId aId q = proc () -> do
(doc, (corpus_doc, (contact_doc, (annuaire_contact, contact)))) <- queryContactViaDoc -< () (doc, (corpus_doc, (_contact_doc, (annuaire_contact, contact)))) <- queryContactViaDoc -< ()
restrict -< (doc^.ns_search) @@ (pgTSQuery $ unpack q ) restrict -< (doc^.ns_search) @@ (pgTSQuery $ unpack q )
restrict -< (doc^.ns_typename) .== (pgInt4 $ nodeTypeId NodeDocument) restrict -< (doc^.ns_typename) .== (pgInt4 $ nodeTypeId NodeDocument)
restrict -< (corpus_doc^.nn_node1_id) .== (toNullable $ pgNodeId cId) restrict -< (corpus_doc^.nn_node1_id) .== (toNullable $ pgNodeId cId)
......
...@@ -24,7 +24,7 @@ import Gargantext.Database.Admin.Types.Node -- (NodeType(..)) ...@@ -24,7 +24,7 @@ import Gargantext.Database.Admin.Types.Node -- (NodeType(..))
import Gargantext.Database.Prelude (Cmd) import Gargantext.Database.Prelude (Cmd)
import Gargantext.Database.Query.Table.Node (getNode, getNodesWith) import Gargantext.Database.Query.Table.Node (getNode, getNodesWith)
import Gargantext.Database.Query.Table.Node.Error (HasNodeError, errorWith) import Gargantext.Database.Query.Table.Node.Error (HasNodeError, errorWith)
import Gargantext.Database.Query.Table.NodeNode (insertNodeNode, deleteNodeNode) import Gargantext.Database.Query.Table.NodeNode (deleteNodeNode)
import Gargantext.Database.Query.Tree.Root (getRootId) import Gargantext.Database.Query.Tree.Root (getRootId)
import Gargantext.Database.Schema.Node import Gargantext.Database.Schema.Node
import Gargantext.Database.Schema.NodeNode (NodeNodePoly(..)) import Gargantext.Database.Schema.NodeNode (NodeNodePoly(..))
......
...@@ -190,7 +190,8 @@ node nodeType name hyperData parentId userId = ...@@ -190,7 +190,8 @@ node nodeType name hyperData parentId userId =
insertNodes :: [NodeWrite] -> Cmd err Int64 insertNodes :: [NodeWrite] -> Cmd err Int64
insertNodes ns = mkCmd $ \conn -> runInsert_ conn $ Insert nodeTable ns rCount Nothing insertNodes ns = mkCmd $ \conn -> runInsert_ conn $ Insert nodeTable ns rCount Nothing
-- insertNodes' :: [Node a] -> Cmd err Int64 {-
insertNodes' :: [Node a] -> Cmd err Int64
insertNodes' ns = mkCmd $ \conn -> runInsert_ conn insertNodes' ns = mkCmd $ \conn -> runInsert_ conn
$ Insert nodeTable ns' rCount Nothing $ Insert nodeTable ns' rCount Nothing
where where
...@@ -204,7 +205,7 @@ insertNodes' ns = mkCmd $ \conn -> runInsert_ conn ...@@ -204,7 +205,7 @@ insertNodes' ns = mkCmd $ \conn -> runInsert_ conn
(pgUTCTime <$> d) (pgUTCTime <$> d)
(pgJSONB $ cs $ encode h) (pgJSONB $ cs $ encode h)
) ns ) ns
-}
insertNodesR :: [NodeWrite] -> Cmd err [NodeId] insertNodesR :: [NodeWrite] -> Cmd err [NodeId]
insertNodesR ns = mkCmd $ \conn -> insertNodesR ns = mkCmd $ \conn ->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment