Commit c7a1072d authored by Alexandre Delanoë's avatar Alexandre Delanoë

[New Node] NodeTexts to Learn Texts and display it.

parent dc1e008d
...@@ -50,7 +50,7 @@ main = do ...@@ -50,7 +50,7 @@ main = do
let let
--tt = (Unsupervised EN 6 0 Nothing) --tt = (Unsupervised EN 6 0 Nothing)
tt = (Multi EN) tt = (Multi EN)
format = WOS -- CsvGargV3 format = CsvHalFormat --WOS -- CsvGargV3
cmd :: forall m. FlowCmdM DevEnv GargError m => m CorpusId cmd :: forall m. FlowCmdM DevEnv GargError m => m CorpusId
cmd = flowCorpusFile (cs user) (Left (cs name :: Text)) (read limit :: Int) tt format corpusPath cmd = flowCorpusFile (cs user) (Left (cs name :: Text)) (read limit :: Int) tt format corpusPath
{- {-
......
...@@ -46,6 +46,7 @@ nodeTypeId n = ...@@ -46,6 +46,7 @@ nodeTypeId n =
NodeCorpusV3 -> 3 NodeCorpusV3 -> 3
NodeCorpus -> 30 NodeCorpus -> 30
NodeAnnuaire -> 31 NodeAnnuaire -> 31
NodeTexts -> 40
NodeDocument -> 4 NodeDocument -> 4
NodeContact -> 41 NodeContact -> 41
--NodeSwap -> 19 --NodeSwap -> 19
......
...@@ -194,6 +194,7 @@ flowCorpusUser l userName corpusName ctype ids = do ...@@ -194,6 +194,7 @@ flowCorpusUser l userName corpusName ctype ids = do
userListId <- flowList userId userCorpusId ngs userListId <- flowList userId userCorpusId ngs
printDebug "userListId" userListId printDebug "userListId" userListId
-- User Graph Flow -- User Graph Flow
_ <- mkTexts userCorpusId userId
--_ <- mkGraph userCorpusId userId --_ <- mkGraph userCorpusId userId
--_ <- mkPhylo userCorpusId userId --_ <- mkPhylo userCorpusId userId
--} --}
......
...@@ -89,22 +89,18 @@ text (FacetDoc _ _ _ h _ _) = title <> "" <> Text.take 100 abstr ...@@ -89,22 +89,18 @@ text (FacetDoc _ _ _ h _ _) = title <> "" <> Text.take 100 abstr
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
apply :: (FlowCmdM DevEnv GargError m) => FavOrTrash -> CorpusId -> [NodeId] -> m [Int] apply :: (FlowCmdM DevEnv GargError m) => FavOrTrash -> CorpusId -> [NodeId] -> m [Int]
apply favTrash cId ns = case favTrash of apply favTrash cId ns = case favTrash of
IsFav -> nodesToFavorite $ map (\n -> (cId, n, True)) ns IsFav -> nodesToFavorite $ map (\n -> (cId, n, True)) ns
IsTrash -> delDocs cId (Documents ns) IsTrash -> delDocs cId (Documents ns)
moreLikeAndApply :: FlowCmdM DevEnv GargError m => FavOrTrash -> CorpusId -> m [Int] moreLikeAndApply :: FlowCmdM DevEnv GargError m => FavOrTrash -> CorpusId -> m [Int]
moreLikeAndApply ft cId = do moreLikeAndApply ft cId = do
priors <- getPriors ft cId priors <- getPriors ft cId
moreLikeWithAndApply priors ft cId moreLikeWithAndApply priors ft cId
moreLikeWithAndApply :: FlowCmdM DevEnv GargError m => Events Bool -> FavOrTrash -> CorpusId -> m [Int] moreLikeWithAndApply :: FlowCmdM DevEnv GargError m => Events Bool -> FavOrTrash -> CorpusId -> m [Int]
moreLikeWithAndApply priors ft cId = do moreLikeWithAndApply priors ft cId = do
ids <- map facetDoc_id <$> moreLikeWith priors ft cId ids <- map facetDoc_id <$> moreLikeWith priors ft cId
apply ft cId ids apply ft cId ids
...@@ -434,6 +434,17 @@ nodeAnnuaireW maybeName maybeAnnuaire pId = node NodeAnnuaire name annuaire (Jus ...@@ -434,6 +434,17 @@ nodeAnnuaireW maybeName maybeAnnuaire pId = node NodeAnnuaire name annuaire (Jus
name = maybe "Annuaire" identity maybeName name = maybe "Annuaire" identity maybeName
annuaire = maybe defaultAnnuaire identity maybeAnnuaire annuaire = maybe defaultAnnuaire identity maybeAnnuaire
------------------------------------------------------------------------
arbitraryTexts :: HyperdataTexts
arbitraryTexts = HyperdataTexts (Just "Preferences")
nodeTextsW :: Maybe Name -> Maybe HyperdataList -> ParentId -> UserId -> NodeWrite
nodeTextsW maybeName maybeList pId = node NodeList name list (Just pId)
where
name = maybe "Texts" identity maybeName
list = maybe arbitraryList identity maybeList
------------------------------------------------------------------------ ------------------------------------------------------------------------
arbitraryList :: HyperdataList arbitraryList :: HyperdataList
arbitraryList = HyperdataList (Just "Preferences") arbitraryList = HyperdataList (Just "Preferences")
...@@ -441,7 +452,7 @@ arbitraryList = HyperdataList (Just "Preferences") ...@@ -441,7 +452,7 @@ arbitraryList = HyperdataList (Just "Preferences")
nodeListW :: Maybe Name -> Maybe HyperdataList -> ParentId -> UserId -> NodeWrite nodeListW :: Maybe Name -> Maybe HyperdataList -> ParentId -> UserId -> NodeWrite
nodeListW maybeName maybeList pId = node NodeList name list (Just pId) nodeListW maybeName maybeList pId = node NodeList name list (Just pId)
where where
name = maybe "Listes" identity maybeName name = maybe "Lists" identity maybeName
list = maybe arbitraryList identity maybeList list = maybe arbitraryList identity maybeList
-------------------- --------------------
...@@ -621,6 +632,9 @@ defaultList :: HasNodeError err => CorpusId -> Cmd err ListId ...@@ -621,6 +632,9 @@ defaultList :: HasNodeError err => CorpusId -> Cmd err ListId
defaultList cId = defaultList cId =
maybe (nodeError NoListFound) (pure . view node_id) . headMay =<< getListsWithParentId cId maybe (nodeError NoListFound) (pure . view node_id) . headMay =<< getListsWithParentId cId
mkTexts :: ParentId -> UserId -> Cmd err [NodeId]
mkTexts p u = insertNodesR [nodeTextsW Nothing Nothing p u]
mkList :: HasNodeError err => ParentId -> UserId -> Cmd err [NodeId] mkList :: HasNodeError err => ParentId -> UserId -> Cmd err [NodeId]
mkList p u = insertNodesR [nodeListW Nothing Nothing p u] mkList p u = insertNodesR [nodeListW Nothing Nothing p u]
......
...@@ -98,7 +98,7 @@ dbTree rootId = map (\(nId, tId, pId, n) -> DbTreeNode nId tId pId n) <$> runPGS ...@@ -98,7 +98,7 @@ dbTree rootId = map (\(nId, tId, pId, n) -> DbTreeNode nId tId pId n) <$> runPGS
FROM nodes AS c FROM nodes AS c
INNER JOIN tree AS s ON c.parent_id = s.id INNER JOIN tree AS s ON c.parent_id = s.id
WHERE c.typename IN (2,3,30,31,7,9,90) WHERE c.typename IN (2,3,5,30,31,40,7,9,90)
) )
SELECT * from tree; SELECT * from tree;
|] (Only rootId) |] (Only rootId)
......
...@@ -306,6 +306,12 @@ hyperdataCorpus = case decode corpusExample of ...@@ -306,6 +306,12 @@ hyperdataCorpus = case decode corpusExample of
instance Arbitrary HyperdataCorpus where instance Arbitrary HyperdataCorpus where
arbitrary = pure hyperdataCorpus -- TODO arbitrary = pure hyperdataCorpus -- TODO
------------------------------------------------------------------------
data HyperdataTexts = HyperdataTexts { hyperdataTexts_desc :: Maybe Text
} deriving (Show, Generic)
$(deriveJSON (unPrefix "hyperdataTexts_") ''HyperdataTexts)
instance Hyperdata HyperdataTexts
------------------------------------------------------------------------ ------------------------------------------------------------------------
data HyperdataAnnuaire = HyperdataAnnuaire { hyperdataAnnuaire_title :: !(Maybe Text) data HyperdataAnnuaire = HyperdataAnnuaire { hyperdataAnnuaire_title :: !(Maybe Text)
, hyperdataAnnuaire_desc :: !(Maybe Text) , hyperdataAnnuaire_desc :: !(Maybe Text)
...@@ -414,6 +420,7 @@ type NodeUser = Node HyperdataUser ...@@ -414,6 +420,7 @@ type NodeUser = Node HyperdataUser
type NodeFolder = Node HyperdataFolder type NodeFolder = Node HyperdataFolder
type NodeCorpus = Node HyperdataCorpus type NodeCorpus = Node HyperdataCorpus
type NodeTexts = Node HyperdataTexts
type NodeCorpusV3 = Node HyperdataCorpus type NodeCorpusV3 = Node HyperdataCorpus
type NodeDocument = Node HyperdataDocument type NodeDocument = Node HyperdataDocument
...@@ -430,7 +437,7 @@ type NodeNotebook = Node HyperdataNotebook ...@@ -430,7 +437,7 @@ type NodeNotebook = Node HyperdataNotebook
------------------------------------------------------------------------ ------------------------------------------------------------------------
data NodeType = NodeUser data NodeType = NodeUser
| NodeFolder | NodeFolder
| NodeCorpus | NodeCorpusV3 | NodeDocument | NodeCorpus | NodeCorpusV3 | NodeTexts | NodeDocument
| NodeAnnuaire | NodeContact | NodeAnnuaire | NodeContact
| NodeGraph | NodePhylo | NodeGraph | NodePhylo
| NodeDashboard | NodeChart | NodeDashboard | NodeChart
......
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