Commit 0bb02fc9 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[CLEAN] before refactoring and database schema change

parent feb86a9a
...@@ -228,22 +228,18 @@ flowCorpusUser l user corpusName ctype ids = do ...@@ -228,22 +228,18 @@ flowCorpusUser l user corpusName ctype ids = do
insertDocs :: ( FlowCmdM env err m insertDocs :: ( FlowCmdM env err m
, FlowCorpus a , FlowCorpus a
) )
=> [a] => UserId
-> UserId
-> CorpusId -> CorpusId
-> [a]
-> m ([DocId], [DocumentWithId a]) -> m ([DocId], [DocumentWithId a])
insertDocs hs uId cId = do insertDocs uId cId hs = do
printDebug "hs" (length hs)
let docs = map addUniqId hs let docs = map addUniqId hs
printDebug "docs" (length docs) newIds <- insertDb uId cId docs
ids <- insertDb uId cId docs
printDebug "ids" (length ids)
-- printDebug "inserted" (map reUniqId ids)
let let
ids' = map reId ids newIds' = map reId newIds
documentsWithId = mergeData (toInserted ids) (Map.fromList $ map viewUniqId' docs) documentsWithId = mergeData (toInserted newIds) (Map.fromList $ map viewUniqId' docs)
_ <- Doc.add cId ids' _ <- Doc.add cId newIds'
pure (ids', documentsWithId) pure (newIds', documentsWithId)
insertMasterDocs :: ( FlowCmdM env err m insertMasterDocs :: ( FlowCmdM env err m
...@@ -256,7 +252,7 @@ insertMasterDocs :: ( FlowCmdM env err m ...@@ -256,7 +252,7 @@ insertMasterDocs :: ( FlowCmdM env err m
-> m [DocId] -> m [DocId]
insertMasterDocs c lang hs = do insertMasterDocs c lang hs = do
(masterUserId, _, masterCorpusId) <- getOrMk_RootWithCorpus (UserName userMaster) (Left corpusMasterName) c (masterUserId, _, masterCorpusId) <- getOrMk_RootWithCorpus (UserName userMaster) (Left corpusMasterName) c
(ids', documentsWithId) <- insertDocs hs masterUserId masterCorpusId (ids', documentsWithId) <- insertDocs masterUserId masterCorpusId hs
_ <- Doc.add masterCorpusId ids' _ <- Doc.add masterCorpusId ids'
-- TODO -- TODO
-- create a corpus with database name (CSV or PubMed) -- create a corpus with database name (CSV or PubMed)
......
...@@ -155,8 +155,8 @@ queryInsert = [sql| ...@@ -155,8 +155,8 @@ queryInsert = [sql|
, ins AS ( , ins AS (
INSERT INTO nodes (typename,user_id,parent_id,name,date,hyperdata) INSERT INTO nodes (typename,user_id,parent_id,name,date,hyperdata)
SELECT * FROM input_rows SELECT * FROM input_rows
-- ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO NOTHING -- on unique index -- this does not return the ids ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO NOTHING -- on unique index -- this does not return the ids
ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO UPDATE SET user_id=EXCLUDED.user_id -- on unique index -- ON CONFLICT ((hyperdata ->> 'uniqIdBdd')) DO UPDATE SET user_id=EXCLUDED.user_id -- on unique index
RETURNING id,hyperdata RETURNING id,hyperdata
) )
......
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