[FLOW] Annuaire commented.

bin/gargantext-import/Main.hs

@@ -33,14 +33,14 @@ import System.Environment (getArgs)
 
 main :: IO ()
 main = do
-  [iniPath, name, corpusPath] <- getArgs
+  [user, iniPath, name, corpusPath] <- getArgs
 
   {-let createUsers :: Cmd ServantErr Int64
       createUsers = insertUsers [gargantuaUser,simpleUser]
   -}
 
   let cmdCorpus :: forall m. FlowCmdM DevEnv ServantErr m => m CorpusId
-      cmdCorpus = flowCorpus CsvHalFormat corpusPath (cs name)
+      cmdCorpus = flowCorpus (cs user) CsvHalFormat corpusPath (cs name)
 
      -- cmd = {-createUsers >>-} cmdCorpus
 

src/Gargantext/Core/Metrics/TFICF.hs

@@ -19,7 +19,6 @@ import Data.Map
 import Gargantext.Prelude
 import Gargantext.Database.Metrics.TFICF
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Text.Metrics.TFICF
 import Gargantext.API.Ngrams
 
 

src/Gargantext/Database/Flow.hs

@@ -35,32 +35,30 @@ import Data.Maybe (Maybe(..), catMaybes)
 import Data.Monoid
 import Data.Text (Text, splitOn, intercalate)
 import qualified Data.Text as Text
-import Data.Tuple.Extra (both)
 import Data.List (concat)
 import GHC.Show (Show)
-import Gargantext.Core.Types (NodePoly(..), ListType(..), listTypeId, Terms(..))
+import Gargantext.Core.Types (NodePoly(..), ListType(..), Terms(..))
 import Gargantext.Core.Types.Individu (Username)
 import Gargantext.Core.Types.Main
 import Gargantext.Core (Lang(..))
-import Gargantext.Database.Config (userMaster, userArbitrary, corpusMasterName)
+import Gargantext.Database.Config (userMaster, corpusMasterName)
 import Gargantext.Database.Flow.Utils (insertToNodeNgrams)
 --import Gargantext.Database.Metrics.TFICF (getTficf)
 import Gargantext.Text.Terms (extractTerms)
 import Gargantext.Text.Metrics.TFICF (Tficf(..))
-import Gargantext.Database.Metrics.Count (getNgramsElementsWithParentNodeId)
 import qualified Gargantext.Database.Node.Document.Add  as Doc  (add)
-import Gargantext.Database.Node.Document.Insert (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
+import Gargantext.Database.Node.Document.Insert -- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
 import Gargantext.Database.Root (getRoot)
-import Gargantext.Database.Schema.Ngrams (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
-import Gargantext.Database.Schema.Node (mkRoot, mkCorpus, getOrMkList, mkGraph, mkDashboard, mkAnnuaire, getCorporaWithParentId, HasNodeError, NodeError(..), nodeError)
-import Gargantext.Database.Schema.NodeNgram (NodeNgramPoly(..), insertNodeNgrams)
-import Gargantext.Database.Schema.NodeNgramsNgrams (NodeNgramsNgramsPoly(..), insertNodeNgramsNgramsNew)
+import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
+import Gargantext.Database.Schema.Node -- (mkRoot, mkCorpus, getOrMkList, mkGraph, mkDashboard, mkAnnuaire, getCorporaWithParentId, HasNodeError, NodeError(..), nodeError)
+-- import Gargantext.Database.Schema.NodeNgram (NodeNgramPoly(..), insertNodeNgrams)
+--import Gargantext.Database.Schema.NodeNgramsNgrams (NodeNgramsNgramsPoly(..), insertNodeNgramsNgramsNew)
 import Gargantext.Database.Schema.User (getUser, UserLight(..))
-import Gargantext.Database.Types.Node (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
+import Gargantext.Database.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
 import Gargantext.Database.Utils (Cmd, CmdM)
 import Gargantext.Text.Terms (TermType(..))
 import Gargantext.Ext.IMT (toSchoolName)
-import Gargantext.Ext.IMTUser (deserialiseImtUsersFromFile)
+--import Gargantext.Ext.IMTUser (deserialiseImtUsersFromFile)
 import Gargantext.Prelude
 import Gargantext.Text.Parsers (parseDocs, FileFormat)
 import System.FilePath (FilePath)
@@ -77,9 +75,6 @@ type FlowCmdM env err m =
   , HasRepoVar env
   )
 
-type DocId = NodeId
-
-
 
 flowCorpus :: FlowCmdM env ServantErr m
            => Username -> FileFormat -> FilePath -> CorpusName -> m CorpusId

src/Gargantext/Database/Metrics/NgramsByNode.hs

@@ -14,6 +14,7 @@ Ngrams by node enable special metrics.
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RankNTypes        #-}
 
 module Gargantext.Database.Metrics.NgramsByNode
   where