From 31b367ebe8bbf0df0982b6d64773634ebb0fc7fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Delano=C3=AB?= <devel+git@delanoe.org>
Date: Mon, 1 Jul 2019 21:14:15 +0200
Subject: [PATCH] [PHYLO] SVG generation in ghci ok.
---
src/Gargantext/Viz/Phylo/API.hs | 2 +-
src/Gargantext/Viz/Phylo/Main.hs | 44 ++++++++++++++------------------
2 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/Gargantext/Viz/Phylo/API.hs b/src/Gargantext/Viz/Phylo/API.hs
index f4031046..de2e49a2 100644
--- a/src/Gargantext/Viz/Phylo/API.hs
+++ b/src/Gargantext/Viz/Phylo/API.hs
@@ -76,7 +76,7 @@ instance Show a => MimeRender PlainText a where
mimeRender _ val = cs ("" <> show val)
instance Show a => MimeRender SVG a where
- mimeRender _ val = DBL.pack $ show val
+ mimeRender _ val = DBL.pack $ ("SVG" <> show val)
------------------------------------------------------------------------
type GetPhylo = QueryParam "listId" ListId
diff --git a/src/Gargantext/Viz/Phylo/Main.hs b/src/Gargantext/Viz/Phylo/Main.hs
index 877f996a..ddea2156 100644
--- a/src/Gargantext/Viz/Phylo/Main.hs
+++ b/src/Gargantext/Viz/Phylo/Main.hs
@@ -18,37 +18,31 @@ Portability : POSIX
module Gargantext.Viz.Phylo.Main
where
-import Debug.Trace (trace)
-import qualified Data.Text as Text
-import Data.Map (Map)
-import Data.Text (Text)
+import Control.Monad.IO.Class (liftIO)
+import Data.GraphViz
import Data.Maybe
-import Servant
+import Data.Text (Text)
+import Debug.Trace (trace)
import GHC.IO (FilePath)
-import Data.GraphViz
-import Gargantext.Prelude
-import Gargantext.Text.Context (TermList)
-import qualified Data.Map as Map
-import qualified Data.List as List
-import qualified Data.Set as Set
-import Gargantext.Viz.Phylo.View.Export
-import Gargantext.Viz.Phylo.Tools
-import Gargantext.Viz.Phylo.LevelMaker
+import Gargantext.API.Ngrams.Tools (getTermsWith)
import Gargantext.Core.Types
-import Gargantext.Text.Terms.WithList
-import Gargantext.Database.Config (userMaster)
+import Gargantext.Database.Flow
+import Gargantext.Database.Schema.Ngrams (NgramsType(..))
import Gargantext.Database.Schema.Node (defaultList)
import Gargantext.Database.Schema.NodeNode (selectDocs)
-import Gargantext.Database.Schema.Ngrams (NgramsType(..))
-import Gargantext.Database.Metrics.NgramsByNode (getNodesByNgramsOnlyUser)
-import Gargantext.Database.Node.Select (selectNodesWithUsername)
-import Gargantext.Database.Flow
-import Gargantext.API.Ngrams.Tools (getTermsWith)
--- TODO : git mv ViewMaker Maker
-import Gargantext.Viz.Phylo.View.ViewMaker
+import Gargantext.Prelude
+import Gargantext.Text.Context (TermList)
+import Gargantext.Text.Terms.WithList
import Gargantext.Viz.Phylo hiding (Svg, Dot)
-import Control.Monad.IO.Class (liftIO)
+import Gargantext.Viz.Phylo.LevelMaker
+import Gargantext.Viz.Phylo.Tools
+import Gargantext.Viz.Phylo.View.Export
+import Gargantext.Viz.Phylo.View.ViewMaker -- TODO Just Maker is fine
+import Servant
import qualified Data.ByteString as DB
+import qualified Data.List as List
+import qualified Data.Map as Map
+import qualified Data.Text as Text
type MinSizeBranch = Int
@@ -60,7 +54,7 @@ flowPhylo :: FlowCmdM env ServantErr m
flowPhylo cId l m fp = do
list <- defaultList cId
- listMaster <- selectNodesWithUsername NodeList userMaster
+ -- listMaster <- selectNodesWithUsername NodeList userMaster
termList <- Map.toList <$> getTermsWith Text.words [list] NgramsTerms GraphTerm
--printDebug "termList" termList
--
2.21.0