From bfbee53abe501edea64271ce0da8210608d2bc57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20Delano=C3=AB?= <devel+git@delanoe.org> Date: Wed, 15 Jun 2022 11:47:57 +0200 Subject: [PATCH] [FIX] IsTex --- gargantext.cabal | 2 +- src/Gargantext/Core/Text/Corpus/API/Istex.hs | 8 ++++---- src/Gargantext/Core/Text/Corpus/Parsers/Date.hs | 3 ++- stack.yaml | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gargantext.cabal b/gargantext.cabal index 14122e45..8d26e86d 100644 --- a/gargantext.cabal +++ b/gargantext.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: gargantext -version: 0.0.5.8.9.4 +version: 0.0.5.8.9.4 synopsis: Search, map, share description: Please see README.md category: Data diff --git a/src/Gargantext/Core/Text/Corpus/API/Istex.hs b/src/Gargantext/Core/Text/Corpus/API/Istex.hs index 8ae8cb83..fb23adfc 100644 --- a/src/Gargantext/Core/Text/Corpus/API/Istex.hs +++ b/src/Gargantext/Core/Text/Corpus/API/Istex.hs @@ -27,11 +27,11 @@ import qualified ISTEX as ISTEX import qualified ISTEX.Client as ISTEX get :: Lang -> Text -> Maybe Integer -> IO [HyperdataDocument] -get la q ml = do +get la q _ml = do --docs <- ISTEX.getMetadataWith q (fromIntegral <$> ml) - printDebug "[Istex.get] calling getMetadataScrollProgress for la" la - printDebug "[Istex.get] calling getMetadataScrollProgress for q" q - printDebug "[Istex.get] calling getMetadataScrollProgress for ml" ml + --printDebug "[Istex.get] calling getMetadataScrollProgress for la" la + --printDebug "[Istex.get] calling getMetadataScrollProgress for q" q + --printDebug "[Istex.get] calling getMetadataScrollProgress for ml" ml -- The "scroll" expects "d/h/m/s/ms" time interval. Let's set it to "1 month" --eDocs <- ISTEX.getMetadataScroll q ((\_n -> pack $ "1m") <$> ml) Nothing 0 --(fromIntegral <$> ml) eDocs <- ISTEX.getMetadataScroll q "1m" Nothing 0 --(fromIntegral <$> ml) diff --git a/src/Gargantext/Core/Text/Corpus/Parsers/Date.hs b/src/Gargantext/Core/Text/Corpus/Parsers/Date.hs index 9f668a9b..dea8d18e 100644 --- a/src/Gargantext/Core/Text/Corpus/Parsers/Date.hs +++ b/src/Gargantext/Core/Text/Corpus/Parsers/Date.hs @@ -73,7 +73,8 @@ type Day = Int -- 1900-04-10 00:00:00 UTC parse :: Lang -> Text -> IO UTCTime parse lang s = do - dateStr' <- parseRawSafe lang s + printDebug "Date: " s + dateStr' <- pure $ dateFlow (DucklingFailure s) -- parseRawSafe lang s case dateFlow dateStr' of DateFlowSuccess ok -> pure ok _ -> withDebugMode (DebugMode True) diff --git a/stack.yaml b/stack.yaml index 04b5319d..2f751091 100644 --- a/stack.yaml +++ b/stack.yaml @@ -73,7 +73,7 @@ extra-deps: - git: https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git commit: 02e03d9b856bd35d391f43da8525330f9d184615 - git: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git - commit: 3888454a844180b87c8edd36b7e06fbdf8e9ffac + commit: 6821f41655e298fa1fac5021c5776a6aed2d18fd - git: https://gitlab.iscpif.fr/gargantext/crawlers/hal.git commit: 9a43470241690a19c1c381c42a62c5dd4e28dff2 - git: https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git -- 2.21.0