[DB|FACT|WIP] fix all imports and warnings. ready for tests

bin/gargantext-adaptative-phylo/Main.hs

@@ -29,7 +29,7 @@ import Data.String (String)
 import Data.Text  (Text, unwords, unpack)
 
 import Gargantext.Prelude
-import Gargantext.Database.Types.Node (HyperdataDocument(..))
+import Gargantext.Database.Admin.Types.Node (HyperdataDocument(..))
 import Gargantext.Text.Context (TermList)
 import Gargantext.Text.Corpus.Parsers.CSV (csv_title, csv_abstract, csv_publication_year)
 import Gargantext.Text.Corpus.Parsers (FileFormat(..),parseFile)
@@ -173,4 +173,4 @@ main = do
                       <> (unpack $ phyloName config)
                       <> "_V2.dot"
 
-            dotToFile output dot
+            dotToFile output dot
\ No newline at end of file

bin/gargantext-import/Main.hs

@@ -19,24 +19,23 @@ Import a corpus binary.
 
 module Main where
 
-import Data.Either
-import Prelude (read)
 import Control.Exception (finally)
+import Data.Either
+import Data.Text (Text)
+import Gargantext.API.Node () -- instances
+import Gargantext.API.Settings (withDevEnv, runCmdDev, DevEnv)
+import Gargantext.API.Types (GargError)
+import Gargantext.Core (Lang(..))
+import Gargantext.Core.Types.Individu (User(..))
+import Gargantext.Database.Action.Flow (FlowCmdM, flowCorpusFile, flowAnnuaire)
+import Gargantext.Database.Action.Query.User (insertUsersDemo)
+import Gargantext.Database.Admin.Types.Node (CorpusId, toHyperdataDocument)
+import Gargantext.Database.Admin.Utils (Cmd, )
 import Gargantext.Prelude
-import Gargantext.Database.Flow (FlowCmdM, flowCorpusFile, flowAnnuaire)
 import Gargantext.Text.Corpus.Parsers (FileFormat(..))
-import Gargantext.Database.Utils (Cmd, )
-import Gargantext.Database.Types.Node (CorpusId, toHyperdataDocument)
-import Gargantext.Database.Schema.User (insertUsersDemo)
-import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Text.Terms (TermType(..))
-import Gargantext.Core (Lang(..))
-import Gargantext.API.Types (GargError)
-import Gargantext.API.Node () -- instances
-import Gargantext.API.Settings (withDevEnv, runCmdDev, DevEnv)
+import Prelude (read)
 import System.Environment (getArgs)
---import Gargantext.Text.Corpus.Parsers.GrandDebat (readFile, GrandDebatReference(..))
-import Data.Text (Text)
 import qualified Data.Text as Text
 
 main :: IO ()

bin/gargantext-init/Main.hs

@@ -21,19 +21,20 @@ module Main where
 
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..))
-import System.Environment (getArgs)
-import Gargantext.Prelude
-import Gargantext.Core.Types.Individu (UserId, User(..))
-import Gargantext.Database.Flow (getOrMkRoot, getOrMk_RootWithCorpus)
-import Gargantext.Database.Schema.Node (getOrMkList)
-import Gargantext.Database.Utils (Cmd, )
-import Gargantext.Database.Types.Node (CorpusId, RootId, HyperdataCorpus, ListId)
-import Gargantext.Database.Schema.User (insertUsersDemo)
-import Gargantext.API.Types (GargError)
 import Gargantext.API.Node () -- instances
 import Gargantext.API.Settings (withDevEnv, runCmdDev)
-import Gargantext.Database.Config (userMaster, corpusMasterName)
-import Gargantext.Database.Init (initTriggers)
+import Gargantext.API.Types (GargError)
+import Gargantext.Core.Types.Individu (UserId, User(..))
+import Gargantext.Database.Action.Flow (getOrMkRoot, getOrMk_RootWithCorpus)
+import Gargantext.Database.Admin.Config (userMaster, corpusMasterName)
+import Gargantext.Database.Admin.Trigger.Init (initTriggers)
+import Gargantext.Database.Admin.Types.Node (CorpusId, RootId, HyperdataCorpus, ListId)
+import Gargantext.Database.Admin.Utils (Cmd, )
+import Gargantext.Database.Action.Query.Node (getOrMkList)
+import Gargantext.Database.Action.Query.User (insertUsersDemo)
+import Gargantext.Prelude
+import System.Environment (getArgs)
+
 main :: IO ()
 main = do
   [iniPath] <- getArgs

bin/gargantext-phylo/Main.hs

@@ -22,42 +22,35 @@ Phylo binaries
 
 module Main where
 
-import System.Directory (doesFileExist) 
-
+import Control.Concurrent.Async as CCA (mapConcurrently)
+import Control.Monad (mapM)
 import Data.Aeson
-import Data.Text (Text, unwords, unlines)
 import Data.List ((++),concat)
+import Data.Maybe
+import Data.Text (Text, unwords, unlines)
 import GHC.Generics
 import GHC.IO (FilePath)
+import Gargantext.Database.Admin.Types.Node
 import Gargantext.Prelude
-import Gargantext.Text.List.CSV (csvGraphTermList)
-import Gargantext.Text.Corpus.Parsers.CSV (csv_title, csv_abstract, csv_publication_year)
-import qualified Gargantext.Text.Corpus.Parsers.CSV as CSV
+import Gargantext.Text.Context (TermList)
 import Gargantext.Text.Corpus.Parsers (FileFormat(..),parseFile)
+import Gargantext.Text.Corpus.Parsers.CSV (csv_title, csv_abstract, csv_publication_year)
+import Gargantext.Text.List.CSV (csvGraphTermList)
 import Gargantext.Text.Terms.WithList
-import Gargantext.Text.Context (TermList)
-
-import Control.Monad (mapM)
-
-import System.Environment
-
 import Gargantext.Viz.Phylo
-import Gargantext.Viz.Phylo.Tools
 import Gargantext.Viz.Phylo.LevelMaker
+import Gargantext.Viz.Phylo.Tools
 import Gargantext.Viz.Phylo.View.Export
 import Gargantext.Viz.Phylo.View.ViewMaker
-
-import Gargantext.Database.Types.Node
-import Data.Maybe
-
-import Control.Concurrent.Async as CCA (mapConcurrently)
-
-import qualified Data.Map    as DM
-import qualified Data.Vector as DV
+import System.Directory (doesFileExist)
+import System.Environment
+import qualified Data.ByteString.Lazy as L
 import qualified Data.List   as DL
+import qualified Data.Map    as DM
 import qualified Data.Text   as DT
+import qualified Data.Vector as DV
+import qualified Gargantext.Text.Corpus.Parsers.CSV as CSV
 import qualified Prelude     as P
-import qualified Data.ByteString.Lazy as L
 
 
 --------------

package.yaml

@@ -32,7 +32,6 @@ library:
   - Gargantext.API.FrontEnd
   - Gargantext.API.Ngrams
   - Gargantext.API.Node
-    #  - Gargantext.API.Orchestrator
   - Gargantext.API.Search
   - Gargantext.API.Settings
   - Gargantext.API.Types
@@ -41,15 +40,13 @@ library:
   - Gargantext.Core.Types.Individu
   - Gargantext.Core.Types.Main
   - Gargantext.Core.Utils.Prefix
-  - Gargantext.Database
-  - Gargantext.Database.Admin.Init
-  - Gargantext.Database.Admin.Config
   - Gargantext.Database.Action.Flow
-  - Gargantext.Database.Schema.Node
-  - Gargantext.Database.Action.Tree
-  - Gargantext.Database.Admin.Types.Node
+  - Gargantext.Database.Action.Query.User
+  - Gargantext.Database.Action.Query.Node
   - Gargantext.Database.Admin.Utils
-  - Gargantext.Database.Schema.User
+  - Gargantext.Database.Admin.Trigger.Init
+  - Gargantext.Database.Admin.Config
+  - Gargantext.Database.Admin.Types.Node
   - Gargantext.Prelude
   - Gargantext.Text
   - Gargantext.Text.Context

src/Gargantext/API/Node.hs

@@ -65,7 +65,6 @@ import Gargantext.Database.Admin.Config (nodeTypeId)
 import Gargantext.Database.Admin.Types.Errors (HasNodeError(..))
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Utils -- (Cmd, CmdM)
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNode
 import Gargantext.Prelude
 import Gargantext.Viz.Chart
@@ -181,42 +180,42 @@ nodeNodeAPI p uId cId nId = withAccess (Proxy :: Proxy (NodeNodeAPI a)) Proxy uI
 ------------------------------------------------------------------------
 -- TODO: make the NodeId type indexed by `a`, then we no longer need the proxy.
 nodeAPI :: forall proxy a. (JSONB a, FromJSON a, ToJSON a) => proxy a -> UserId -> NodeId -> GargServer (NodeAPI a)
-nodeAPI p uId id = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode id) nodeAPI'
+nodeAPI p uId id' = withAccess (Proxy :: Proxy (NodeAPI a)) Proxy uId (PathNode id') nodeAPI'
   where
     nodeAPI' :: GargServer (NodeAPI a)
-    nodeAPI' =  getNodeWith   id p
-           :<|> rename        id
-           :<|> postNode  uId id
-           :<|> putNode       id
-           :<|> deleteNodeApi id
-           :<|> getChildren   id p
+    nodeAPI' =  getNodeWith   id' p
+           :<|> rename        id'
+           :<|> postNode  uId id'
+           :<|> putNode       id'
+           :<|> deleteNodeApi id'
+           :<|> getChildren   id' p
 
            -- TODO gather it
-           :<|> tableApi             id
-           :<|> apiNgramsTableCorpus id
+           :<|> tableApi             id'
+           :<|> apiNgramsTableCorpus id'
 
-           :<|> catApi      id
+           :<|> catApi      id'
 
-           :<|> searchDocs  id
+           :<|> searchDocs  id'
            -- Pairing Tools
-           :<|> pairWith    id
-           :<|> pairs       id
-           :<|> getPair     id
-           :<|> searchPairs id
-
-           :<|> getScatter id
-           :<|> getChart   id
-           :<|> getPie     id
-           :<|> getTree    id
-           :<|> phyloAPI   id uId
-           -- :<|> nodeAddAPI id
-           -- :<|> postUpload id
-
-    deleteNodeApi id' = do
-      node <- getNode id'
-      if _node_typename node == nodeTypeId NodeUser
+           :<|> pairWith    id'
+           :<|> pairs       id'
+           :<|> getPair     id'
+           :<|> searchPairs id'
+
+           :<|> getScatter id'
+           :<|> getChart   id'
+           :<|> getPie     id'
+           :<|> getTree    id'
+           :<|> phyloAPI   id' uId
+           -- :<|> nodeAddAPI id'
+           -- :<|> postUpload id'
+
+    deleteNodeApi id'' = do
+      node' <- getNode id''
+      if _node_typename node' == nodeTypeId NodeUser
          then panic "not allowed"  -- TODO add proper Right Management Type
-         else deleteNode id'
+         else deleteNode id''
 
 ------------------------------------------------------------------------
 data RenameNode = RenameNode { r_name :: Text }

src/Gargantext/Database/Action/Flow.hs

@@ -57,7 +57,6 @@ import Gargantext.Database.Action.Flow.List
 import Gargantext.Database.Action.Flow.Types
 import Gargantext.Database.Action.Flow.Utils (insertDocNgrams, getUserId)
 import Gargantext.Database.Action.Query.Node
-import Gargantext.Database.Action.Query.User
 import Gargantext.Database.Action.Query.Node.Contact -- (HyperdataContact(..), ContactWho(..))
 import Gargantext.Database.Action.Query.Node.Document.Insert -- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
 import Gargantext.Database.Action.Query.Tree.Root (getRoot)
@@ -68,7 +67,6 @@ import Gargantext.Database.Admin.Types.Errors (HasNodeError(..), NodeError(..),
 import Gargantext.Database.Admin.Types.Node -- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
 import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Database.Schema.Ngrams -- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams,  NgramsType(..), text2ngrams, ngramsTypeId)
-import Gargantext.Database.Schema.Node -- (mkRoot, mkCorpus, getOrMkList, mkGraph, {-mkPhylo,-} mkDashboard, mkAnnuaire, getCorporaWithParentId, HasNodeError, NodeError(..), nodeError)
 import Gargantext.Database.Schema.NodeNgrams (listInsertDb , getCgramsId)
 import Gargantext.Database.Schema.NodeNodeNgrams2 -- (NodeNodeNgrams2, insertNodeNodeNgrams2)
 import Gargantext.Ext.IMT (toSchoolName)

src/Gargantext/Database/Action/Flow/Utils.hs

@@ -18,7 +18,6 @@ module Gargantext.Database.Action.Flow.Utils
     where
 
 import Data.Map (Map)
-import Gargantext.Core.Types (Name)
 import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Query.Node
 import Gargantext.Database.Action.Query.User
@@ -26,7 +25,6 @@ import Gargantext.Database.Admin.Types.Errors
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Utils (Cmd)
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.User
 import Gargantext.Database.Schema.NodeNodeNgrams
 import Gargantext.Prelude

src/Gargantext/Database/Action/Query.hs

@@ -30,12 +30,9 @@ module Gargantext.Database.Action.Query
 import Gargantext.Core.Types (Name)
 import Gargantext.Database.Action.Query.Node
 import Gargantext.Database.Action.Query.Node.User
-import Gargantext.Database.Action.Query.User
 import Gargantext.Database.Admin.Types.Errors
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Utils (Cmd)
-import Gargantext.Database.Schema.Node
-import Opaleye hiding (FromField)
 import Prelude hiding (null, id, map, sum)
 
 ------------------------------------------------------------------------

src/Gargantext/Database/Action/Query/Ngrams.hs

@@ -21,11 +21,9 @@ import Control.Arrow (returnA)
 import Control.Lens ((^.))
 import Data.Text (Text)
 import Gargantext.Core.Types
-import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Admin.Types.Node (pgNodeId)
 import Gargantext.Database.Admin.Utils (runOpaQuery, Cmd)
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.NodeNodeNgrams
 import Gargantext.Prelude
 import Opaleye

src/Gargantext/Database/Action/Query/Node.hs

@@ -29,15 +29,11 @@ module Gargantext.Database.Action.Query.Node
 
 import Control.Arrow (returnA)
 import Control.Lens (set, view)
-import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Aeson
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text)
-import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Int (Int64)
 import Gargantext.Core.Types
-import Gargantext.Core.Types.Individu (User(..))
 import Gargantext.Database.Action.Query.Filter (limit', offset')
 import Gargantext.Database.Admin.Config (nodeTypeId)
 import Gargantext.Database.Admin.Types.Errors

src/Gargantext/Database/Action/Query/Node/Select.hs

@@ -25,7 +25,6 @@ import Gargantext.Database.Admin.Utils
 import Gargantext.Database.Schema.Node
 import Gargantext.Database.Schema.User
 import Gargantext.Database.Action.Query.User
-import Gargantext.Database.Action.Query.Node
 import Opaleye
 
 selectNodesWithUsername :: NodeType -> Username -> Cmd err [NodeId]

src/Gargantext/Database/Action/Query/Node/User.hs

@@ -15,6 +15,7 @@ Portability : POSIX
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE MultiParamTypeClasses  #-}
 {-# LANGUAGE NoImplicitPrelude      #-}
+{-# LANGUAGE OverloadedStrings      #-}
 {-# LANGUAGE RankNTypes             #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
@@ -30,7 +31,7 @@ import Database.PostgreSQL.Simple.FromField (FromField, fromField)
 import GHC.Generics (Generic)
 import Gargantext.Core (Lang(..))
 import Gargantext.Core.Types (Name)
-import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
+import Gargantext.Core.Types.Individu
 import Gargantext.Database.Admin.Types.Node (NodeType(..))
 import Gargantext.Database.Action.Query.Node
 import Gargantext.Core.Utils.Prefix (unPrefix, unPrefixSwagger)

src/Gargantext/Database/Action/Query/Tree.hs

@@ -14,6 +14,7 @@ Let a Root Node, return the Tree of the Node as a directed acyclic graph
 
 {-# LANGUAGE FlexibleContexts  #-}
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE QuasiQuotes       #-}
 {-# LANGUAGE RankNTypes        #-}
 
@@ -28,9 +29,7 @@ import Database.PostgreSQL.Simple
 import Database.PostgreSQL.Simple.SqlQQ
 import Gargantext.Core.Types.Individu
 import Gargantext.Core.Types.Main (NodeTree(..), Tree(..))
-import Gargantext.Database.Action.Query.Node
 import Gargantext.Database.Admin.Types.Node -- (pgNodeId, NodeType(..))
-import Gargantext.Database.Action.Query.User
 import Gargantext.Database.Action.Query
 import Gargantext.Database.Action.Flow.Utils (getUserId)
 import Gargantext.Database.Admin.Config (fromNodeTypeId, nodeTypeId)

src/Gargantext/Database/Action/Query/Tree/Root.hs

@@ -35,7 +35,7 @@ import Gargantext.Database.Schema.Node (NodeRead)
 import Gargantext.Database.Schema.Node (queryNodeTable)
 import Gargantext.Database.Schema.User (UserPoly(..))
 import Gargantext.Database.Action.Query.User (queryUserTable)
-import Gargantext.Database.Admin.Types.Node (Node, NodePoly(..), NodeType(NodeUser))
+import Gargantext.Database.Admin.Types.Node (Node, NodePoly(..), NodeType(NodeUser), pgNodeId)
 import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery)
 import Gargantext.Prelude
 import Opaleye (restrict, (.==), Query)
@@ -59,3 +59,12 @@ selectRoot (UserDBId uid) = proc () -> do
     restrict -< _node_userId   row   .== (pgInt4 uid)
     returnA  -< row
 
+selectRoot (RootId nid) =
+ proc () -> do
+    row   <- queryNodeTable -< ()
+    restrict -< _node_typename row   .== (pgInt4 $ nodeTypeId NodeUser)
+    restrict -< _node_id   row   .== (pgNodeId nid)
+    returnA  -< row
+
+
+

src/Gargantext/Database/Action/Query/User.hs

@@ -27,16 +27,12 @@ module Gargantext.Database.Action.Query.User
   where
 
 import Control.Arrow (returnA)
-import Control.Lens.TH (makeLensesWith, abbreviatedFields)
 import Data.Eq(Eq(..))
 import Data.List (find)
 import Data.Maybe (Maybe)
-import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text)
 import Data.Time (UTCTime)
-import GHC.Show(Show(..))
-import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
-import Gargantext.Database.Admin.Types.Errors
+import Gargantext.Core.Types.Individu
 import Gargantext.Database.Schema.User
 import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude

src/Gargantext/Database/Schema/Node.hs

@@ -26,24 +26,13 @@ Portability : POSIX
 
 module Gargantext.Database.Schema.Node where
 
-import Control.Arrow (returnA)
-import Control.Lens (set, view)
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
-import Data.Aeson
-import Data.Maybe (Maybe(..), fromMaybe)
+import Data.Maybe (Maybe(..))
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text)
 import Database.PostgreSQL.Simple.FromField (FromField, fromField)
-import GHC.Int (Int64)
 import Gargantext.Core.Types
-import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Database.Action.Query.Filter (limit', offset')
-import Gargantext.Database.Action.Query.Node.Contact (HyperdataContact(..), arbitraryHyperdataContact)
-import Gargantext.Database.Admin.Config (nodeTypeId)
-import Gargantext.Database.Admin.Types.Errors
-import Gargantext.Database.Admin.Types.Node (NodeType(..), defaultCorpus, Hyperdata, HyperData(..))
 import Gargantext.Database.Admin.Utils
-import Gargantext.Prelude hiding (sum, head)
 import Gargantext.Viz.Graph (HyperdataGraph(..))
 import Opaleye hiding (FromField)
 import Opaleye.Internal.QueryArr (Query)

src/Gargantext/Database/Schema/Node_NodeNgramsNodeNgrams.hs

@@ -41,7 +41,7 @@ import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Gargantext.Database.Admin.Utils (Cmd, runOpaQuery, mkCmd)
 import Gargantext.Database.Admin.Types.Node (CorpusId, pgNodeId)
-import Gargantext.Database.Schema.Node
+import Gargantext.Database.Schema.Node()
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Database/Schema/User.hs

@@ -25,18 +25,12 @@ Functions to deal with users, database side.
 
 module Gargantext.Database.Schema.User where
 
-import Control.Arrow (returnA)
 import Control.Lens.TH (makeLensesWith, abbreviatedFields)
-import Data.Eq(Eq(..))
-import Data.List (find)
 import Data.Maybe (Maybe)
 import Data.Profunctor.Product.TH (makeAdaptorAndInstance)
 import Data.Text (Text)
 import Data.Time (UTCTime)
 import GHC.Show(Show(..))
-import Gargantext.Core.Types.Individu (Username, arbitraryUsername, User(..), UserId)
-import Gargantext.Database.Admin.Types.Errors
-import Gargantext.Database.Admin.Utils
 import Gargantext.Prelude
 import Opaleye
 

src/Gargantext/Viz/Chart.hs

@@ -40,7 +40,6 @@ import Gargantext.Core.Types
 import Gargantext.Database.Action.Flow
 import Gargantext.Database.Action.Metrics.NgramsByNode
 import Gargantext.Database.Schema.Ngrams
-import Gargantext.Database.Schema.Node
 import Servant
 import qualified Data.List as List
 import qualified Data.Map as Map

src/Gargantext/Viz/Graph/API.hs

@@ -50,7 +50,6 @@ import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Action.Query.Node.Select
 import Gargantext.Database.Action.Query.Node
 import Gargantext.Database.Action.Query.Node.User
-import Gargantext.Database.Schema.Node -- (getNodeWith, getNodeUser, defaultList, insertGraph)
 import Gargantext.Database.Admin.Types.Errors (HasNodeError)
 import Gargantext.Database.Admin.Types.Node hiding (node_id) -- (GraphId, ListId, CorpusId, NodeId)
 import Gargantext.Database.Action.Query.Node.UpdateOpaleye (updateHyperdata)
@@ -84,9 +83,10 @@ instance Xmlbf.ToXml Graph where
           params = HashMap.fromList [ ("mode", "static")
                                     , ("defaultedgetype", "directed") ]
       nodes :: [G.Node] -> [Xmlbf.Node]
-      nodes gn = Xmlbf.element "nodes" HashMap.empty $ P.concatMap node gn
-      node :: G.Node -> [Xmlbf.Node]
-      node (G.Node { node_id = nId, node_label = l }) =
+      nodes gn = Xmlbf.element "nodes" HashMap.empty $ P.concatMap node' gn
+
+      node' :: G.Node -> [Xmlbf.Node]
+      node' (G.Node { node_id = nId, node_label = l }) =
         Xmlbf.element "node" params []
         where
           params = HashMap.fromList [ ("id", nId)