Commit a4978c3b authored by Alexandre Delanoë's avatar Alexandre Delanoë

[ISIDORE API] FIX ReplyOnly.

parent 8f285b42
...@@ -37,8 +37,14 @@ get la l q a = do ...@@ -37,8 +37,14 @@ get la l q a = do
let let
printErr (DecodeFailure e _) = panic e printErr (DecodeFailure e _) = panic e
printErr e = panic (cs $ show e) printErr e = panic (cs $ show e)
iDocs <- either printErr (_docs) <$> Isidore.get l q a
hDocs <- mapM (\d -> isidoreToDoc la d) iDocs toIsidoreDocs :: Reply -> [IsidoreDoc]
toIsidoreDocs (ReplyOnly r) = [r]
toIsidoreDocs (Replies rs) = rs
iDocs <- either printErr _content <$> Isidore.get l q a
hDocs <- mapM (\d -> isidoreToDoc la d) (toIsidoreDocs iDocs)
pure hDocs pure hDocs
isidore2csvFile :: FilePath -> Lang -> Maybe Isidore.Limit isidore2csvFile :: FilePath -> Lang -> Maybe Isidore.Limit
...@@ -61,8 +67,8 @@ isidoreToDoc l (IsidoreDoc t a d u s as) = do ...@@ -61,8 +67,8 @@ isidoreToDoc l (IsidoreDoc t a d u s as) = do
langText :: LangText -> Text langText :: LangText -> Text
langText (LangText _l t1) = t1 langText (LangText _l t1) = t1
langText (OnlyText t2 ) = t2 langText (OnlyText t2 ) = t2
langText (ArrayText ts) = Text.intercalate " " $ map langText ts langText (ArrayText ts ) = Text.intercalate " " $ map langText ts
(utcTime, (pub_year, pub_month, pub_day)) <- Date.split l (maybe (Just "2019") (Just) d) (utcTime, (pub_year, pub_month, pub_day)) <- Date.split l (maybe (Just "2019") (Just) d)
......
...@@ -33,7 +33,7 @@ extra-deps: ...@@ -33,7 +33,7 @@ extra-deps:
- git: https://github.com/delanoe/hsparql.git - git: https://github.com/delanoe/hsparql.git
commit: 308c74b71a1abb0a91546fa57d353131248e3a7f commit: 308c74b71a1abb0a91546fa57d353131248e3a7f
- git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git - git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git
commit: 069118b29198ee1044a685d8c08dcfb242d601e3 commit: e39454101b53916e3082085ebfe922df695fc775
- KMP-0.1.0.2 - KMP-0.1.0.2
- accelerate-1.2.0.0 - accelerate-1.2.0.0
- aeson-lens-0.5.0.0 - aeson-lens-0.5.0.0
......
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