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
158
Issues
158
List
Board
Labels
Milestones
Merge Requests
11
Merge Requests
11
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
10f9f394
Unverified
Commit
10f9f394
authored
Oct 18, 2018
by
Nicolas Pouillard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use desc instead of descr and use defaultCorpus
parent
2ca441e5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
Node.hs
src/Gargantext/Database/Node.hs
+1
-3
Node.hs
src/Gargantext/Database/Types/Node.hs
+7
-4
No files found.
src/Gargantext/Database/Node.hs
View file @
10f9f394
...
...
@@ -40,7 +40,7 @@ import Prelude hiding (null, id, map, sum)
import
Gargantext.Core
(
Lang
(
..
))
import
Gargantext.Core.Types
import
Gargantext.Database.Types.Node
(
NodeType
)
import
Gargantext.Database.Types.Node
(
NodeType
,
defaultCorpus
)
import
Gargantext.Database.Queries
import
Gargantext.Database.Config
(
nodeTypeId
)
import
Gargantext.Prelude
hiding
(
sum
)
...
...
@@ -318,8 +318,6 @@ nodeFolderW maybeName maybeFolder pid = node NodeFolder name (Hyperdata folder)
name
=
maybe
"Folder"
identity
maybeName
folder
=
maybe
defaultFolder
identity
maybeFolder
------------------------------------------------------------------------
defaultCorpus
::
HyperdataCorpus
defaultCorpus
=
(
HyperdataCorpus
(
Just
"Title"
)
(
Just
"Descr"
)
(
Just
"Bool query"
)
(
Just
"Authors"
)
Nothing
)
nodeCorpusW
::
Maybe
Name
->
Maybe
HyperdataCorpus
->
ParentId
->
UserId
->
NodeWrite'
nodeCorpusW
maybeName
maybeCorpus
pId
=
node
NodeCorpus
name
(
Hyperdata
corpus
)
(
Just
pId
)
...
...
src/Gargantext/Database/Types/Node.hs
View file @
10f9f394
...
...
@@ -206,13 +206,13 @@ data HyperdataUser = HyperdataUser { hyperdataUser_language :: Maybe Text
$
(
deriveJSON
(
unPrefix
"hyperdataUser_"
)
''
H
yperdataUser
)
data
HyperdataFolder
=
HyperdataFolder
{
hyperdataFolder_desc
r
::
Maybe
Text
data
HyperdataFolder
=
HyperdataFolder
{
hyperdataFolder_desc
::
Maybe
Text
}
deriving
(
Show
,
Generic
)
$
(
deriveJSON
(
unPrefix
"hyperdataFolder_"
)
''
H
yperdataFolder
)
data
HyperdataCorpus
=
HyperdataCorpus
{
hyperdataCorpus_title
::
Maybe
Text
,
hyperdataCorpus_desc
r
::
Maybe
Text
,
hyperdataCorpus_desc
::
Maybe
Text
,
hyperdataCorpus_query
::
Maybe
Text
,
hyperdataCorpus_authors
::
Maybe
Text
,
hyperdataCorpus_resources
::
Maybe
[
Resource
]
...
...
@@ -221,7 +221,7 @@ $(deriveJSON (unPrefix "hyperdataCorpus_") ''HyperdataCorpus)
------------------------------------------------------------------------
data
HyperdataAnnuaire
=
HyperdataAnnuaire
{
hyperdataAnnuaire_title
::
Maybe
Text
,
hyperdataAnnuaire_desc
r
::
Maybe
Text
,
hyperdataAnnuaire_desc
::
Maybe
Text
}
deriving
(
Show
,
Generic
)
$
(
deriveJSON
(
unPrefix
"hyperdataAnnuaire_"
)
''
H
yperdataAnnuaire
)
------------------------------------------------------------------------
...
...
@@ -365,10 +365,13 @@ docExample = "{\"doi\":\"sdfds\",\"publication_day\":6,\"language_iso2\":\"en\",
corpusExample
::
ByteString
corpusExample
=
""
-- TODO
defaultCorpus
::
HyperdataCorpus
defaultCorpus
=
(
HyperdataCorpus
(
Just
"Title"
)
(
Just
"Descr"
)
(
Just
"Bool query"
)
(
Just
"Authors"
)
Nothing
)
hyperdataCorpus
::
HyperdataCorpus
hyperdataCorpus
=
case
decode
corpusExample
of
Just
hp
->
hp
Nothing
->
HyperdataCorpus
Nothing
Nothing
Nothing
Nothing
Nothing
Nothing
->
defaultCorpus
instance
ToSchema
HyperdataCorpus
where
declareNamedSchema
proxy
=
genericDeclareNamedSchema
defaultSchemaOptions
proxy
...
...
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