Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
195
Issues
195
List
Board
Labels
Milestones
Merge Requests
12
Merge Requests
12
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
d1a288ff
Commit
d1a288ff
authored
Aug 01, 2019
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FIX] PubMed api ok.
parent
203bd3b0
Pipeline
#539
failed with stage
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
11 deletions
+5
-11
New.hs
src/Gargantext/API/Corpus/New.hs
+1
-2
Flow.hs
src/Gargantext/Database/Flow.hs
+2
-4
API.hs
src/Gargantext/Text/Corpus/API.hs
+0
-3
API.hs
src/Gargantext/Viz/Graph/API.hs
+1
-1
stack.yaml
stack.yaml
+1
-1
No files found.
src/Gargantext/API/Corpus/New.hs
View file @
d1a288ff
...
@@ -76,7 +76,7 @@ api (Query q _ as) = do
...
@@ -76,7 +76,7 @@ api (Query q _ as) = do
Nothing
->
flowCorpusSearchInDatabase
"user1"
EN
q
Nothing
->
flowCorpusSearchInDatabase
"user1"
EN
q
Just
API
.
All
->
flowCorpusSearchInDatabase
"user1"
EN
q
Just
API
.
All
->
flowCorpusSearchInDatabase
"user1"
EN
q
Just
a
->
do
Just
a
->
do
docs
<-
liftIO
$
API
.
get
a
q
Nothing
docs
<-
liftIO
$
API
.
get
a
q
(
Just
1000
)
cId'
<-
flowCorpus
"user1"
(
Left
q
)
(
Multi
EN
)
[
docs
]
cId'
<-
flowCorpus
"user1"
(
Left
q
)
(
Multi
EN
)
[
docs
]
pure
cId'
pure
cId'
...
@@ -96,4 +96,3 @@ info :: FlowCmdM env err m => UserId -> m ApiInfo
...
@@ -96,4 +96,3 @@ info :: FlowCmdM env err m => UserId -> m ApiInfo
info
_u
=
pure
$
ApiInfo
API
.
externalAPIs
info
_u
=
pure
$
ApiInfo
API
.
externalAPIs
src/Gargantext/Database/Flow.hs
View file @
d1a288ff
...
@@ -57,7 +57,7 @@ import Gargantext.Database.Node.Contact -- (HyperdataContact(..), ContactWho(..)
...
@@ -57,7 +57,7 @@ import Gargantext.Database.Node.Contact -- (HyperdataContact(..), ContactWho(..)
import
Gargantext.Database.Node.Document.Insert
-- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
import
Gargantext.Database.Node.Document.Insert
-- (insertDocuments, ReturnId(..), addUniqIdsDoc, addUniqIdsContact, ToDbData(..))
import
Gargantext.Database.Root
(
getRoot
)
import
Gargantext.Database.Root
(
getRoot
)
import
Gargantext.Database.Schema.Ngrams
-- (insertNgrams, Ngrams(..), NgramsIndexed(..), indexNgrams, NgramsType(..), text2ngrams, ngramsTypeId)
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.Node
-- (mkRoot, mkCorpus, getOrMkList, mkGraph,
{-mkPhylo,-}
mkDashboard, mkAnnuaire, getCorporaWithParentId, HasNodeError, NodeError(..), nodeError)
import
Gargantext.Database.Schema.User
(
getUser
,
UserLight
(
..
))
import
Gargantext.Database.Schema.User
(
getUser
,
UserLight
(
..
))
import
Gargantext.Database.TextSearch
(
searchInDatabase
)
import
Gargantext.Database.TextSearch
(
searchInDatabase
)
import
Gargantext.Database.Types.Node
-- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
import
Gargantext.Database.Types.Node
-- (HyperdataDocument(..), NodeType(..), NodeId, UserId, ListId, CorpusId, RootId, MasterCorpusId, MasterUserId)
...
@@ -177,8 +177,6 @@ flowCorpus :: (FlowCmdM env err m, FlowCorpus a)
...
@@ -177,8 +177,6 @@ flowCorpus :: (FlowCmdM env err m, FlowCorpus a)
flowCorpus
=
flow
(
Nothing
::
Maybe
HyperdataCorpus
)
flowCorpus
=
flow
(
Nothing
::
Maybe
HyperdataCorpus
)
------------------------------------------------------------------------
------------------------------------------------------------------------
flowCorpusUser
::
(
FlowCmdM
env
err
m
,
MkCorpus
c
)
flowCorpusUser
::
(
FlowCmdM
env
err
m
,
MkCorpus
c
)
=>
Lang
->
Username
->
Either
CorpusName
[
CorpusId
]
->
Maybe
c
->
[
NodeId
]
->
m
CorpusId
=>
Lang
->
Username
->
Either
CorpusName
[
CorpusId
]
->
Maybe
c
->
[
NodeId
]
->
m
CorpusId
flowCorpusUser
l
userName
corpusName
ctype
ids
=
do
flowCorpusUser
l
userName
corpusName
ctype
ids
=
do
...
@@ -199,7 +197,7 @@ flowCorpusUser l userName corpusName ctype ids = do
...
@@ -199,7 +197,7 @@ flowCorpusUser l userName corpusName ctype ids = do
-- User Graph Flow
-- User Graph Flow
_
<-
mkDashboard
userCorpusId
userId
_
<-
mkDashboard
userCorpusId
userId
_
<-
mkGraph
userCorpusId
userId
_
<-
mkGraph
userCorpusId
userId
_
<-
mkPhylo
userCorpusId
userId
--
_
<-
mkPhylo
userCorpusId
userId
--}
--}
...
...
src/Gargantext/Text/Corpus/API.hs
View file @
d1a288ff
...
@@ -89,6 +89,3 @@ toDoc l (Doc.PubMed (Doc.PubMedArticle t j as aus)
...
@@ -89,6 +89,3 @@ toDoc l (Doc.PubMed (Doc.PubMedArticle t j as aus)
abstract
::
Maybe
[
Text
]
->
Maybe
Text
abstract
::
Maybe
[
Text
]
->
Maybe
Text
abstract
as'
=
fmap
(
Text
.
intercalate
", "
)
as'
abstract
as'
=
fmap
(
Text
.
intercalate
", "
)
as'
src/Gargantext/Viz/Graph/API.hs
View file @
d1a288ff
...
@@ -77,7 +77,7 @@ getGraph nId = do
...
@@ -77,7 +77,7 @@ getGraph nId = do
<$>
groupNodesByNgrams
ngs
<$>
groupNodesByNgrams
ngs
<$>
getNodesByNgramsOnlyUser
cId
(
lIds
<>
[
lId
])
NgramsTerms
(
Map
.
keys
ngs
)
<$>
getNodesByNgramsOnlyUser
cId
(
lIds
<>
[
lId
])
NgramsTerms
(
Map
.
keys
ngs
)
graph
<-
liftIO
$
cooc2graph
1
myCooc
graph
<-
liftIO
$
cooc2graph
0
myCooc
pure
$
set
graph_metadata
(
Just
metadata
)
graph
pure
$
set
graph_metadata
(
Just
metadata
)
graph
...
...
stack.yaml
View file @
d1a288ff
...
@@ -23,7 +23,7 @@ extra-deps:
...
@@ -23,7 +23,7 @@ extra-deps:
-
git
:
https://github.com/robstewart57/rdf4h.git
-
git
:
https://github.com/robstewart57/rdf4h.git
commit
:
4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
commit
:
4fd2edf30c141600ffad6d730cc4c1c08a6dbce4
-
git
:
https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git
-
git
:
https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git
commit
:
23a3e2cdad564299aa294286a9fc74c550bd09db
commit
:
ac4f8ecfb2e579041a350e4718bc6d4e7a832d92
-
git
:
https://gitlab.iscpif.fr/gargantext/crawlers/hal.git
-
git
:
https://gitlab.iscpif.fr/gargantext/crawlers/hal.git
commit
:
bf57642f6b66f554fdc0a38ac391cd8200dffcb3
commit
:
bf57642f6b66f554fdc0a38ac391cd8200dffcb3
-
git
:
https://gitlab.iscpif.fr/gargantext/patches-class
-
git
:
https://gitlab.iscpif.fr/gargantext/patches-class
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment