Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
H
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Przemyslaw Kaminski
haskell-gargantext
Commits
ceffe8d3
Commit
ceffe8d3
authored
Oct 04, 2021
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[frame write] date paser work, update lts to 18.12
This doesn't compile yet.
parent
ac77596e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
12 deletions
+30
-12
README.md
README.md
+1
-1
Dockerfile
devops/docker/Dockerfile
+2
-2
docker-install
devops/docker/docker-install
+1
-1
package.yaml
package.yaml
+1
-0
DocumentsFromWriteNodes.hs
src/Gargantext/API/Node/DocumentsFromWriteNodes.hs
+3
-3
FrameWrite.hs
src/Gargantext/Core/Text/Corpus/Parsers/FrameWrite.hs
+19
-3
stack.yaml
stack.yaml
+3
-2
No files found.
README.md
View file @
ceffe8d3
...
...
@@ -134,7 +134,7 @@ For Docker env, first create the appropriate image:
```
sh
cd
devops/docker
docker build
-t
cgenie/stack-build:lts-1
7.13
-garg
.
docker build
-t
cgenie/stack-build:lts-1
8.12
-garg
.
```
then run:
...
...
devops/docker/Dockerfile
View file @
ceffe8d3
FROM
fpco/stack-build:lts-1
7.13
FROM
fpco/stack-build:lts-1
8.12
RUN
apt-key adv
--keyserver
hkp://pool.sks-keyservers.net:80
--recv-keys
8B1DA6120C2BF624
#
RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 8B1DA6120C2BF624
RUN
apt-get update
&&
\
apt-get
install
-y
git libigraph0-dev
&&
\
rm
-rf
/var/lib/apt/lists/
*
...
...
devops/docker/docker-install
View file @
ceffe8d3
...
...
@@ -54,7 +54,7 @@ git clone https://gitlab.iscpif.fr/gargantext/purescript-gargantext
../install-deps
$(
pwd
)
pushd
devops/docker
docker build
--pull
-t
fpco/stack-build:lts-1
7.13
-garg
.
docker build
--pull
-t
fpco/stack-build:lts-1
8.12
-garg
.
popd
#stack docker pull
...
...
package.yaml
View file @
ceffe8d3
...
...
@@ -176,6 +176,7 @@ library:
-
pandoc
-
parallel
-
parsec
-
parsec3-numbers
-
patches-class
-
patches-map
-
path
...
...
src/Gargantext/API/Node/DocumentsFromWriteNodes.hs
View file @
ceffe8d3
...
...
@@ -122,9 +122,9 @@ hyperdataDocumentFromFrameWrite (HyperdataFrame { _hf_base, _hf_frame_id }, cont
,
_hd_source
=
source
,
_hd_abstract
=
Just
c
,
_hd_publication_date
=
date
,
_hd_publication_year
=
Nothing
-- TODO
,
_hd_publication_month
=
Nothing
-- TODO
,
_hd_publication_day
=
Nothing
-- TODO
,
_hd_publication_year
=
Just
2021
-- TODO
,
_hd_publication_month
=
Just
10
-- TODO
,
_hd_publication_day
=
Just
4
-- TODO
,
_hd_publication_hour
=
Nothing
,
_hd_publication_minute
=
Nothing
,
_hd_publication_second
=
Nothing
...
...
src/Gargantext/Core/Text/Corpus/Parsers/FrameWrite.hs
View file @
ceffe8d3
...
...
@@ -8,6 +8,7 @@ import Data.Text hiding (foldl)
import
Gargantext.Prelude
import
Prelude
((
++
))
import
Text.Parsec
hiding
(
Line
)
import
Text.Parsec.Number
(
number
)
import
Text.Parsec.String
...
...
@@ -76,10 +77,16 @@ emptyParsed =
,
source
=
Nothing
,
contents
=
""
}
data
Date
=
Date
{
year
::
Int
,
month
::
Int
,
day
::
Int
}
deriving
(
Show
)
data
Line
=
LAuthors
[
Author
]
|
LContents
Text
|
LDate
Text
|
LDate
Date
|
LSource
Text
|
LTitle
Text
deriving
(
Show
)
...
...
@@ -115,7 +122,7 @@ authorsLineP = do
dateLineP
::
Parser
Line
dateLineP
=
do
date
<-
dateP
pure
$
LDate
$
pack
date
pure
$
LDate
date
sourceLineP
::
Parser
Line
sourceLineP
=
do
...
...
@@ -173,6 +180,15 @@ dateP :: Parser [Char]
dateP
=
try
datePrefixP
*>
many
(
noneOf
"
\n
"
)
dateISOP
::
Parser
Date
dateISOP
=
do
year
<-
number
_
<-
char
'-'
month
<-
number
_
<-
char
'-'
day
<-
number
pure
$
Date
{
year
,
month
,
day
}
sourcePrefixP
::
Parser
[
Char
]
sourcePrefixP
=
do
_
<-
string
"^@@source:"
...
...
stack.yaml
View file @
ceffe8d3
resolver
:
url
:
https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/
4
.yaml
url
:
https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/
12
.yaml
flags
:
{}
extra-package-dbs
:
[]
packages
:
...
...
@@ -11,7 +11,7 @@ packages:
docker
:
enable
:
false
repo
:
'
cgenie/stack-build:lts-1
7.13
-garg'
repo
:
'
cgenie/stack-build:lts-1
8.12
-garg'
run-args
:
-
'
--publish=8008:8008'
...
...
@@ -99,6 +99,7 @@ extra-deps:
-
logging-effect-1.3.12@sha256:72d168dd09887649ba9501627219b6027cbec2d5541931555b7885b133785ce3,1679
-
MissingH-1.4.3.0@sha256:32f9892ec98cd21df4f4d3ed8d95a3831ae74287ea0641d6f09b2dc6ef061d39,4859
-
monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
-
parsec-numbers-0.1@sha256:60fa05b1c16050dffd0e28cecb682a021eeec1be6f34dc9d901a38c90182f289,727
-
rake-0.0.1@sha256:3380f6567fb17505d1095b7f32222c0b631fa04126ad39726c84262da99c08b3,2025
-
servant-cassava-0.10.1@sha256:07e7b6ca67cf57dcb4a0041a399a25d058844505837c6479e01d62be59d01fdf,1665
-
servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
...
...
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