Commit 70ffa332 authored by Nicolas Pouillard's avatar Nicolas Pouillard

Adding ngrams to the table now has a proper patch!

NgramsPatch now has a new constructor NgramsReplace.
Simplify getTableNgramsVersion
Comment listNgramsChangedSince
parent 4ef15dd7
Pipeline #1066 failed with stage
This diff is collapsed.
...@@ -74,6 +74,7 @@ get' lId = fromList ...@@ -74,6 +74,7 @@ get' lId = fromList
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- TODO : purge list -- TODO : purge list
-- TODO talk
post :: FlowCmdM env err m post :: FlowCmdM env err m
=> ListId => ListId
-> NgramsList -> NgramsList
......
...@@ -20,7 +20,7 @@ module Gargantext.Core.Utils.Prefix ...@@ -20,7 +20,7 @@ module Gargantext.Core.Utils.Prefix
import Prelude import Prelude
import Data.Aeson (Value, defaultOptions, parseJSON) import Data.Aeson (Value, defaultOptions, parseJSON)
import Data.Aeson.TH (Options, fieldLabelModifier, omitNothingFields) import Data.Aeson.TH (Options, fieldLabelModifier, omitNothingFields, sumEncoding, SumEncoding(UntaggedValue))
import Data.Aeson.Types (Parser) import Data.Aeson.Types (Parser)
import Data.Char (toLower) import Data.Char (toLower)
import Data.Monoid ((<>)) import Data.Monoid ((<>))
...@@ -36,6 +36,10 @@ unPrefix prefix = defaultOptions ...@@ -36,6 +36,10 @@ unPrefix prefix = defaultOptions
, omitNothingFields = True , omitNothingFields = True
} }
unPrefixUntagged :: String -> Options
unPrefixUntagged prefix = (unPrefix prefix)
{ sumEncoding = UntaggedValue }
unPrefixSwagger :: String -> SchemaOptions unPrefixSwagger :: String -> SchemaOptions
unPrefixSwagger = fromAesonOptions . unPrefix unPrefixSwagger = fromAesonOptions . unPrefix
......
...@@ -20,6 +20,7 @@ module Gargantext.Database.Action.Flow.Types ...@@ -20,6 +20,7 @@ module Gargantext.Database.Action.Flow.Types
where where
import Data.Aeson (ToJSON) import Data.Aeson (ToJSON)
import Gargantext.Core.Types (HasInvalidError)
import Gargantext.Core.Flow.Types import Gargantext.Core.Flow.Types
import Gargantext.Core.Text import Gargantext.Core.Text
import Gargantext.Core.Text.Terms import Gargantext.Core.Text.Terms
...@@ -32,6 +33,7 @@ type FlowCmdM env err m = ...@@ -32,6 +33,7 @@ type FlowCmdM env err m =
( CmdM env err m ( CmdM env err m
, RepoCmdM env err m , RepoCmdM env err m
, HasNodeError err , HasNodeError err
, HasInvalidError err
, HasRepoVar env , HasRepoVar env
) )
......
...@@ -3,6 +3,8 @@ flags: {} ...@@ -3,6 +3,8 @@ flags: {}
extra-package-dbs: [] extra-package-dbs: []
packages: packages:
- . - .
- 'deps/patches-class'
- 'deps/patches-map'
#- 'deps/servant-job' #- 'deps/servant-job'
#- 'deps/clustering-louvain' #- 'deps/clustering-louvain'
...@@ -42,16 +44,16 @@ extra-deps: ...@@ -42,16 +44,16 @@ extra-deps:
- git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git - git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git
commit: 3db385e767d2100d8abe900833c6e7de3ac55e1b commit: 3db385e767d2100d8abe900833c6e7de3ac55e1b
# #
- git: https://gitlab.iscpif.fr/gargantext/patches-class #- git: https://gitlab.iscpif.fr/gargantext/patches-class
commit: 746b4ce0af8f9e600d555ad7e5b2973a940cdad9 # commit: 746b4ce0af8f9e600d555ad7e5b2973a940cdad9
#- git: https://github.com/delanoe/servant-job.git #- git: https://github.com/delanoe/servant-job.git
#commit: 7a7b7100e6d132adb4c11b25b2128e6309690ac0 #commit: 7a7b7100e6d132adb4c11b25b2128e6309690ac0
- git: https://github.com/np/servant-job.git - git: https://github.com/np/servant-job.git
commit: 6487744c322baaa9229fdabd321a878a5b363c61 commit: 6487744c322baaa9229fdabd321a878a5b363c61
- git: https://gitlab.iscpif.fr/gargantext/clustering-louvain.git - git: https://gitlab.iscpif.fr/gargantext/clustering-louvain.git
commit: 7d74f96dfea8e51fbab1793cc0429b2fe741f73d commit: 7d74f96dfea8e51fbab1793cc0429b2fe741f73d
- git: https://github.com/np/patches-map #- git: https://github.com/np/patches-map
commit: 8c6f38c4844ead53e664cf9c82ba461715dbe445 # commit: 8c6f38c4844ead53e664cf9c82ba461715dbe445
- git: https://github.com/delanoe/haskell-opaleye.git #- opaleye-0.6.7002.0 - git: https://github.com/delanoe/haskell-opaleye.git #- opaleye-0.6.7002.0
commit: 63ee65d974e9d20eaaf17a2e83652175988cbb79 commit: 63ee65d974e9d20eaaf17a2e83652175988cbb79
- git: https://github.com/delanoe/hsparql.git - git: https://github.com/delanoe/hsparql.git
......
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