Commit 40967e89 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[REBASE] Dev <-> dev-phylo

parent dc29199c
Pipeline #2475 passed with stage
in 49 minutes and 15 seconds
...@@ -76,7 +76,7 @@ phylo2dot2json phylo = do ...@@ -76,7 +76,7 @@ phylo2dot2json phylo = do
_ <- Shell.callProcess "/usr/bin/dot" ["-Txdot_json", "-o", file_to_json, file_dot] _ <- Shell.callProcess "/usr/bin/dot" ["-Txdot_json", "-o", file_to_json, file_dot]
maybeValue <- decodeFileStrict file_to_json maybeValue <- decodeFileStrict file_to_json
_ <- Shell.callProcess "/bin/rm" ["-rf", file_from, file_to_json, file_dot] _ <- Shell.callProcess "/bin/rm" ["-rf", file_from, file_to_json, file_dot]
case maybeValue of case maybeValue of
......
...@@ -37,6 +37,8 @@ import Gargantext.Database.Query.Table.Node (insertNodes, node) ...@@ -37,6 +37,8 @@ import Gargantext.Database.Query.Table.Node (insertNodes, node)
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Core.Viz.LegacyPhylo import Gargantext.Core.Viz.LegacyPhylo
import Gargantext.Core.Viz.Phylo.Legacy.LegacyMain import Gargantext.Core.Viz.Phylo.Legacy.LegacyMain
import Gargantext.Core.Viz.Phylo.API
import Gargantext.Core.Viz.Phylo (defaultConfig)
-- import Gargantext.Core.Viz.Phylo.Example -- import Gargantext.Core.Viz.Phylo.Example
import Gargantext.Core.Types (TODO(..)) import Gargantext.Core.Types (TODO(..))
import Data.Either import Data.Either
...@@ -126,7 +128,7 @@ postPhylo corpusId userId _lId = do ...@@ -126,7 +128,7 @@ postPhylo corpusId userId _lId = do
-- _vrs = Just ("1" :: Text) -- _vrs = Just ("1" :: Text)
-- _sft = Just (Software "Gargantext" "4") -- _sft = Just (Software "Gargantext" "4")
-- _prm = initPhyloParam vrs sft (Just q) -- _prm = initPhyloParam vrs sft (Just q)
phy <- flowPhylo corpusId -- params phy <- flowPhyloAPI defaultConfig corpusId -- params
phyloId <- insertNodes [node NodePhylo "Phylo" (HyperdataPhylo Nothing (Just phy)) (Just corpusId) userId] phyloId <- insertNodes [node NodePhylo "Phylo" (HyperdataPhylo Nothing (Just phy)) (Just corpusId) userId]
pure $ NodeId (fromIntegral phyloId) pure $ NodeId (fromIntegral phyloId)
......
...@@ -23,7 +23,7 @@ module Gargantext.Database.Admin.Types.Hyperdata.Phylo ...@@ -23,7 +23,7 @@ module Gargantext.Database.Admin.Types.Hyperdata.Phylo
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Database.Admin.Types.Hyperdata.Prelude import Gargantext.Database.Admin.Types.Hyperdata.Prelude
import Gargantext.Core.Viz.LegacyPhylo (Phylo(..)) import Gargantext.Core.Viz.Phylo (Phylo(..))
------------------------------------------------------------------------ ------------------------------------------------------------------------
......
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