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
118
Issues
118
List
Board
Labels
Milestones
Merge Requests
7
Merge Requests
7
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
d08b5fac
Commit
d08b5fac
authored
May 09, 2022
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Plain Diff
[MERGE]
parents
a2140c82
f4249676
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
12 deletions
+17
-12
CHANGELOG.md
CHANGELOG.md
+3
-0
gargantext.cabal
gargantext.cabal
+2
-1
package.yaml
package.yaml
+1
-1
Node.hs
src/Gargantext/API/Node.hs
+5
-6
New.hs
src/Gargantext/API/Node/Corpus/New.hs
+1
-1
Update.hs
src/Gargantext/API/Node/Update.hs
+5
-3
No files found.
CHANGELOG.md
View file @
d08b5fac
## Version 0.0.5.8.8.2
*
[
FE
]
Fix Contact Page
## Version 0.0.5.8.8.1
## Version 0.0.5.8.8.1
*
[
FE
]
Fix regression on Graph Explorer: edges color + confluence filter
*
[
FE
]
Fix regression on Graph Explorer: edges color + confluence filter
...
...
gargantext.cabal
View file @
d08b5fac
...
@@ -5,7 +5,7 @@ cabal-version: 1.12
...
@@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
-- see: https://github.com/sol/hpack
name: gargantext
name: gargantext
version: 0.0.5.8.
7
.2
version: 0.0.5.8.
8
.2
synopsis: Search, map, share
synopsis: Search, map, share
description: Please see README.md
description: Please see README.md
category: Data
category: Data
...
@@ -106,6 +106,7 @@ library
...
@@ -106,6 +106,7 @@ library
Gargantext.API.EKG
Gargantext.API.EKG
Gargantext.API.Flow
Gargantext.API.Flow
Gargantext.API.GraphQL
Gargantext.API.GraphQL
Gargantext.API.GraphQL.Annuaire
Gargantext.API.GraphQL.AsyncTask
Gargantext.API.GraphQL.AsyncTask
Gargantext.API.GraphQL.IMT
Gargantext.API.GraphQL.IMT
Gargantext.API.GraphQL.Node
Gargantext.API.GraphQL.Node
...
...
package.yaml
View file @
d08b5fac
...
@@ -6,7 +6,7 @@ name: gargantext
...
@@ -6,7 +6,7 @@ name: gargantext
# | | | +----- Layers * : New versions with API additions
# | | | +----- Layers * : New versions with API additions
# | | | | +--- Layers * : New versions without API breaking changes
# | | | | +--- Layers * : New versions without API breaking changes
# | | | | |
# | | | | |
version
:
'
0.0.5.8.8.
1
'
version
:
'
0.0.5.8.8.
2
'
synopsis
:
Search, map, share
synopsis
:
Search, map, share
description
:
Please see README.md
description
:
Please see README.md
category
:
Data
category
:
Data
...
...
src/Gargantext/API/Node.hs
View file @
d08b5fac
...
@@ -21,8 +21,6 @@ Node API
...
@@ -21,8 +21,6 @@ Node API
-}
-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE TypeOperators #-}
...
@@ -264,10 +262,11 @@ instance ToJSON NodesToCategory
...
@@ -264,10 +262,11 @@ instance ToJSON NodesToCategory
instance
ToSchema
NodesToCategory
instance
ToSchema
NodesToCategory
catApi
::
CorpusId
->
GargServer
CatApi
catApi
::
CorpusId
->
GargServer
CatApi
catApi
=
putCat
catApi
cId
cs'
=
do
where
ret
<-
nodeContextsCategory
$
map
(
\
n
->
(
cId
,
n
,
ntc_category
cs'
))
(
ntc_nodesId
cs'
)
putCat
::
CorpusId
->
NodesToCategory
->
Cmd
err
[
Int
]
lId
<-
defaultList
cId
putCat
cId
cs'
=
nodeContextsCategory
$
map
(
\
n
->
(
cId
,
n
,
ntc_category
cs'
))
(
ntc_nodesId
cs'
)
_
<-
updateChart
cId
(
Just
lId
)
Docs
Nothing
pure
ret
------------------------------------------------------------------------
------------------------------------------------------------------------
type
ScoreApi
=
Summary
" To Score NodeNodes"
type
ScoreApi
=
Summary
" To Score NodeNodes"
...
...
src/Gargantext/API/Node/Corpus/New.hs
View file @
d08b5fac
...
@@ -220,7 +220,7 @@ addToCorpusWithQuery user cid (WithQuery { _wq_query = q
...
@@ -220,7 +220,7 @@ addToCorpusWithQuery user cid (WithQuery { _wq_query = q
eTxts
<-
mapM
(
\
db
->
getDataText
db
(
Multi
l
)
q
maybeLimit
)
[
database2origin
dbs
]
eTxts
<-
mapM
(
\
db
->
getDataText
db
(
Multi
l
)
q
maybeLimit
)
[
database2origin
dbs
]
let
lTxts
=
lefts
eTxts
let
lTxts
=
lefts
eTxts
printDebug
"[G.A.N.C.New]
e
Txts"
lTxts
printDebug
"[G.A.N.C.New]
l
Txts"
lTxts
case
lTxts
of
case
lTxts
of
[]
->
do
[]
->
do
let
txts
=
rights
eTxts
let
txts
=
rights
eTxts
...
...
src/Gargantext/API/Node/Update.hs
View file @
d08b5fac
...
@@ -24,6 +24,7 @@ import GHC.Generics (Generic)
...
@@ -24,6 +24,7 @@ import GHC.Generics (Generic)
import
Gargantext.API.Admin.Orchestrator.Types
(
JobLog
(
..
),
AsyncJobs
)
import
Gargantext.API.Admin.Orchestrator.Types
(
JobLog
(
..
),
AsyncJobs
)
import
Gargantext.API.Admin.Types
(
HasSettings
)
import
Gargantext.API.Admin.Types
(
HasSettings
)
import
Gargantext.API.Ngrams.List
(
reIndexWith
)
import
Gargantext.API.Ngrams.List
(
reIndexWith
)
--import Gargantext.API.Ngrams.Types (TabType(..))
import
Gargantext.API.Prelude
(
GargServer
,
simuLogs
)
import
Gargantext.API.Prelude
(
GargServer
,
simuLogs
)
import
Gargantext.Core.Methods.Distances
(
GraphMetric
(
..
))
import
Gargantext.Core.Methods.Distances
(
GraphMetric
(
..
))
import
Gargantext.Core.Types.Main
(
ListType
(
..
))
import
Gargantext.Core.Types.Main
(
ListType
(
..
))
...
@@ -153,9 +154,9 @@ updateNode _uId lId (UpdateNodeParamsList Advanced) logStatus = do
...
@@ -153,9 +154,9 @@ updateNode _uId lId (UpdateNodeParamsList Advanced) logStatus = do
_
<-
case
corpusId
of
_
<-
case
corpusId
of
Just
cId
->
do
Just
cId
->
do
_
<-
Metrics
.
updatePie
'
cId
(
Just
lId
)
NgramsTypes
.
Authors
Nothing
_
<-
Metrics
.
updatePie
cId
(
Just
lId
)
NgramsTypes
.
Authors
Nothing
_
<-
Metrics
.
updateTree
'
cId
(
Just
lId
)
NgramsTypes
.
Institutes
MapTerm
_
<-
Metrics
.
updateTree
cId
(
Just
lId
)
NgramsTypes
.
Institutes
MapTerm
_
<-
Metrics
.
updatePie
'
cId
(
Just
lId
)
NgramsTypes
.
Sources
Nothing
_
<-
Metrics
.
updatePie
cId
(
Just
lId
)
NgramsTypes
.
Sources
Nothing
pure
()
pure
()
Nothing
->
pure
()
Nothing
->
pure
()
...
@@ -240,6 +241,7 @@ updateNode _uId tId (UpdateNodeParamsTexts _mode) logStatus = do
...
@@ -240,6 +241,7 @@ updateNode _uId tId (UpdateNodeParamsTexts _mode) logStatus = do
_
<-
reIndexWith
cId
lId
NgramsTerms
(
Set
.
singleton
MapTerm
)
_
<-
reIndexWith
cId
lId
NgramsTerms
(
Set
.
singleton
MapTerm
)
_
<-
updateNgramsOccurrences
cId
(
Just
lId
)
_
<-
updateNgramsOccurrences
cId
(
Just
lId
)
_
<-
updateContextScore
cId
(
Just
lId
)
_
<-
updateContextScore
cId
(
Just
lId
)
_
<-
Metrics
.
updateChart
cId
(
Just
lId
)
NgramsTypes
.
Docs
Nothing
-- printDebug "updateContextsScore" (cId, lId, u)
-- printDebug "updateContextsScore" (cId, lId, u)
pure
()
pure
()
Nothing
->
pure
()
Nothing
->
pure
()
...
...
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