[FIX] conflicts

nix/pkgs.nix

@@ -62,6 +62,7 @@ rec {
       pkgs.gmp
       pkgs.lapack
       pkgs.libxml2
+      pkgs.nanomsg
       pkgs.plfit
     ] ++ pkgs.lib.optionals pkgs.stdenv.cc.isClang [
       pkgs.llvmPackages.openmp

src/Gargantext/API/Node/Update.hs

@@ -34,8 +34,7 @@ import Gargantext.Database.Action.Flow (reIndexWith)
 import Gargantext.Database.Action.Flow.Pairing (pairing)
 import Gargantext.Database.Action.Metrics (updateNgramsOccurrences, updateContextScore)
 import Gargantext.Database.Admin.Types.Hyperdata.Phylo ( HyperdataPhylo(HyperdataPhylo) )
-import Gargantext.Database.Admin.Types.Node ( NodeId,
-    NodeType(NodeCorpus, NodeAnnuaire, NodeTexts, NodeList) )
+import Gargantext.Database.Admin.Types.Node ( NodeId, NodeType(NodeCorpus, NodeAnnuaire, NodeTexts, NodeGraph, NodePhylo, NodeList) )
 import Gargantext.Database.Query.Table.Node (defaultList, getNode, getChildrenByType)
 import Gargantext.Database.Query.Table.Node.UpdateOpaleye (updateHyperdata)
 import Gargantext.Database.Schema.Node (node_parent_id)
@@ -146,15 +145,21 @@ updateNode tId (UpdateNodeParamsTexts _mode) jobHandle = do
 
   markComplete jobHandle
 
-updateNode tId (UpdateNodeParamsCorpus methodTexts methodList) jobHandle = do
+updateNode tId
+    (UpdateNodeParamsCorpus methodGraph methodPhylo methodTexts methodList)
+    jobHandle = do
   markStarted 3 jobHandle
   markProgress 1 jobHandle
 
   _ <- getNode tId
   childTexts <- getChildrenByType tId NodeTexts
+  childGraphs <- getChildrenByType tId NodeGraph
+  childPhylos <- getChildrenByType tId NodePhylo
   childNodeLists <- getChildrenByType tId NodeList
 
   mapM_ (\cId -> updateNode cId (UpdateNodeParamsTexts methodTexts) jobHandle) childTexts
+  mapM_ (\cId -> updateNode cId (UpdateNodeParamsGraph methodGraph) jobHandle) childGraphs
+  mapM_ (\cId -> updateNode cId (UpdateNodePhylo methodPhylo) jobHandle) childPhylos
   mapM_ (\cId -> updateNode cId (UpdateNodeParamsList methodList) jobHandle) childNodeLists
 
   markComplete jobHandle

src/Gargantext/API/Node/Update/Types.hs

@@ -21,7 +21,13 @@ data UpdateNodeParams = UpdateNodeParamsList  { methodList  :: !Method      }
 
                       | UpdateNodeParamsTexts { methodTexts :: !Granularity }
 
+<<<<<<< HEAD
                       | UpdateNodeParamsCorpus { methodTexts :: !Granularity
+=======
+                      | UpdateNodeParamsCorpus { methodGraph :: !UpdateNodeConfigGraph
+                                               , methodPhylo :: !PhyloSubConfigAPI
+                                               , methodTexts :: !Granularity
+>>>>>>> origin/dev-add-nanomsg-to-nix
                                                , methodList  :: !Method }
 
                       | UpdateNodeParamsBoard { methodBoard :: !Charts      }

start

@@ -16,7 +16,7 @@ docker compose up -d
 echo "GarganText: docker for postgresql database [OK]"
 cd ../../
 echo "GarganText: gargantext-server with Nix and Cabal..."
-nix-shell --run "cabal run gargantext-server -- --ini gargantext.ini --run Prod +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE"
+nix-shell --run "cabal run gargantext-server -- --toml gargantext-settings.toml --run Prod +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE"
 echo "GarganText: gargantext-server with Nix and Cabal [OK]"
 echo "GarganText: project stopped."