Commit 38ebe154 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[FLOW] only one corpus for the user (again).

parent ec9906ef
Pipeline #291 failed with stage
...@@ -22,7 +22,7 @@ module Main where ...@@ -22,7 +22,7 @@ module Main where
import Control.Exception (finally) import Control.Exception (finally)
import Servant (ServantErr) import Servant (ServantErr)
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Database.Flow (FlowCmdM, flowCorpus'') import Gargantext.Database.Flow (FlowCmdM, flowCorpus)
import Gargantext.Text.Parsers (FileFormat(CsvHalFormat)) import Gargantext.Text.Parsers (FileFormat(CsvHalFormat))
import Gargantext.Database.Utils (Cmd, ) import Gargantext.Database.Utils (Cmd, )
import Gargantext.Database.Types.Node (CorpusId) import Gargantext.Database.Types.Node (CorpusId)
...@@ -47,10 +47,10 @@ main = do ...@@ -47,10 +47,10 @@ main = do
let cmdCorpus :: forall m. FlowCmdM DevEnv ServantErr m => m CorpusId let cmdCorpus :: forall m. FlowCmdM DevEnv ServantErr m => m CorpusId
cmdCorpus = flowCorpus (cs user) (cs name) (Mono EN) CsvHalFormat corpusPath cmdCorpus = flowCorpus (cs user) (cs name) (Mono EN) CsvHalFormat corpusPath
--} --}
let cmdCorpus :: forall m. FlowCmdM DevEnv ServantErr m => m [CorpusId] let cmdCorpus :: forall m. FlowCmdM DevEnv ServantErr m => m CorpusId
cmdCorpus = do cmdCorpus = do
docs <- liftIO (splitEvery 500 <$> readFile corpusPath :: IO [[GrandDebatReference ]]) docs <- liftIO (splitEvery 500 <$> readFile corpusPath :: IO [[GrandDebatReference ]])
ids <- flowCorpus'' (Text.pack user) (Text.pack name) (Mono FR) docs ids <- flowCorpus (Text.pack user) (Text.pack name) (Mono FR) docs
pure ids pure ids
-- cmd = {-createUsers >>-} cmdCorpus -- cmd = {-createUsers >>-} cmdCorpus
......
...@@ -59,12 +59,12 @@ import Gargantext.Database.Utils (Cmd, CmdM) ...@@ -59,12 +59,12 @@ import Gargantext.Database.Utils (Cmd, CmdM)
import Gargantext.Ext.IMT (toSchoolName) import Gargantext.Ext.IMT (toSchoolName)
import Gargantext.Prelude import Gargantext.Prelude
--import Gargantext.Text.List --import Gargantext.Text.List
import Gargantext.Text.Parsers (parseDocs, FileFormat) --import Gargantext.Text.Parsers (parseDocs, FileFormat)
import Gargantext.Text.Terms (TermType(..)) import Gargantext.Text.Terms (TermType(..))
import Gargantext.Text.Terms (extractTerms) import Gargantext.Text.Terms (extractTerms)
import Gargantext.Text.Terms.Mono.Stem.En (stemIt) import Gargantext.Text.Terms.Mono.Stem.En (stemIt)
import Servant (ServantErr) import Servant (ServantErr)
import System.FilePath (FilePath) --import System.FilePath (FilePath)
import qualified Data.Map as DM import qualified Data.Map as DM
import qualified Data.Text as Text import qualified Data.Text as Text
import qualified Gargantext.Database.Node.Document.Add as Doc (add) import qualified Gargantext.Database.Node.Document.Add as Doc (add)
...@@ -76,21 +76,21 @@ type FlowCmdM env err m = ...@@ -76,21 +76,21 @@ type FlowCmdM env err m =
, HasRepoVar env , HasRepoVar env
) )
{-
flowCorpus :: FlowCmdM env ServantErr m flowCorpus :: FlowCmdM env ServantErr m
=> Username -> CorpusName -> TermType Lang -> FileFormat -> FilePath -> m CorpusId => Username -> CorpusName -> TermType Lang -> FileFormat -> FilePath -> m CorpusId
flowCorpus u cn la ff fp = liftIO (parseDocs ff fp) >>= \docs -> flowCorpus' u cn la docs flowCorpus u cn la ff fp = undefined -- liftIO (parseDocs ff fp) >>= \docs -> flowCorpus' u cn la docs
--{- flowCorpus''' :: (FlowCmdM env ServantErr m, ToHyperdataDocument a)
flowCorpus'' :: (FlowCmdM env ServantErr m, ToHyperdataDocument a)
=> Username -> CorpusName -> TermType Lang -> [[a]] -> m [CorpusId] => Username -> CorpusName -> TermType Lang -> [[a]] -> m [CorpusId]
flowCorpus'' u cn la docs = mapM (\doc -> flowCorpus' u cn la doc) docs flowCorpus''' u cn la docs = mapM (\doc -> flowCorpus' u cn la doc) docs
--} --}
flowCorpus' :: (FlowCmdM env ServantErr m, ToHyperdataDocument a) flowCorpus :: (FlowCmdM env ServantErr m, ToHyperdataDocument a)
=> Username -> CorpusName -> TermType Lang -> [a] -> m CorpusId => Username -> CorpusName -> TermType Lang -> [[a]] -> m CorpusId
flowCorpus' u cn la docs = do flowCorpus u cn la docs = do
ids <- flowCorpusMaster la (map toHyperdataDocument docs) ids <- mapM (\doc -> flowCorpusMaster la (map toHyperdataDocument doc)) docs
flowCorpusUser u cn ids flowCorpusUser u cn $ concat ids
-- TODO query with complex query -- TODO query with complex query
......
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