renaming HAL.Corpus to HAL.Document

bin/update-project-dependencies

@@ -18,10 +18,10 @@ fi
 # with the `sha256sum` result calculated on the `cabal.project` and
 # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
 # cache can kick in.
-expected_cabal_project_hash="ec368714e0d4213dcc60e7c98344ab9a4ecbcff522deb4c57a12490e3b048585"
+expected_cabal_project_hash="c2c8ffc22f513f962745a00db6f9199eca89066ecbb47c850e5969550a4e6e1e"
 expected_cabal_project_freeze_hash="0999af7642e822e6b4e2996b743c8f924cdfa406c9b2941bb53f1ca7b3a0737d"
 
-cabal --store-dir=$STORE_DIR v2-build --dry-run
+cabal --store-dir=$STORE_DIR v2-build --dry-run --minimize-conflict-set
 cabal2stack --system-ghc --allow-newer --resolver lts-21.17 --resolver-file devops/stack/lts-21.17.yaml -o stack.yaml
 cabal --store-dir=$STORE_DIR v2-freeze
 

cabal.project

@@ -93,7 +93,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/crawlers/hal.git
-    tag: 3665ccda54893d01bb27220538eefdde0c1e7419
+    tag: 1dbd939257d33126e49d2679375553df1f2eebc5
 
 source-repository-package
     type: git

src/Gargantext/Core/Text/Corpus/API/Hal.hs

@@ -21,7 +21,7 @@ import Gargantext.Database.Admin.Types.Hyperdata.Document ( HyperdataDocument(..
 import Gargantext.Defaults qualified as Defaults
 import Gargantext.Prelude hiding (intercalate)
 import HAL qualified
-import HAL.Doc.Corpus qualified as HAL
+import HAL.Doc.Document qualified as HAL
 import HAL.Types qualified as HAL
 import Servant.Client (ClientError)
 
@@ -38,23 +38,23 @@ getC la q ml = do
 --    Left err -> panic $ pack $ show err
 --    Right (len, docsC) -> pure (len, docsC .| mapMC (toDoc' la))
 
-toDoc' :: Maybe ISO639.ISO639_1 -> HAL.Corpus -> IO HyperdataDocument
-toDoc' la (HAL.Corpus { .. }) = do
+toDoc' :: Maybe ISO639.ISO639_1 -> HAL.Document -> IO HyperdataDocument
+toDoc' la (HAL.Document { .. }) = do
   -- printDebug "[toDoc corpus] h" h
-  let mDateS = _corpus_date <|> Just (pack $ show Defaults.year)
+  let mDateS = _document_date <|> Just (pack $ show Defaults.year)
   let (utctime, (pub_year, pub_month, pub_day)) = Date.mDateSplit mDateS
-  let abstractDefault = unwords _corpus_abstract
+  let abstractDefault = unwords _document_abstract
   let abstract = case la of
         Nothing -> abstractDefault
-        Just l  -> maybe abstractDefault unwords (Map.lookup l _corpus_abstract_lang_map)
+        Just l  -> maybe abstractDefault unwords (Map.lookup l _document_abstract_lang_map)
   pure HyperdataDocument { _hd_bdd = Just "Hal"
-                         , _hd_doi = Just $ pack $ show _corpus_docid
+                         , _hd_doi = Just $ pack $ show _document_docid
                          , _hd_url = Nothing
                          , _hd_page = Nothing
-                         , _hd_title = Just $ unwords _corpus_title
-                         , _hd_authors = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" _corpus_authors_names
-                         , _hd_institutes = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" $ _corpus_authors_affiliations <> map show _corpus_struct_id
-                         , _hd_source = Just $ maybe "Nothing" identity _corpus_source
+                         , _hd_title = Just $ unwords _document_title
+                         , _hd_authors = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" _document_authors_names
+                         , _hd_institutes = Just $ foldl' (\x y -> if x == "" then y else x <> ", " <> y) "" $ _document_authors_affiliations <> map show _document_struct_id
+                         , _hd_source = Just $ maybe "Nothing" identity _document_source
                          , _hd_abstract = Just abstract
                          , _hd_publication_date = fmap show utctime
                          , _hd_publication_year = pub_year

stack.yaml

@@ -126,7 +126,7 @@
   git: "https://gitlab.iscpif.fr/gargantext/crawlers/epo-proxy-api.git"
   subdirs:
   - .
-- commit: 3665ccda54893d01bb27220538eefdde0c1e7419
+- commit: 1dbd939257d33126e49d2679375553df1f2eebc5
   git: "https://gitlab.iscpif.fr/gargantext/crawlers/hal.git"
   subdirs:
   - .
@@ -316,7 +316,7 @@ flags:
   "full-text-search":
     "build-search-demo": false
   gargantext:
-    "no-phylo-debug-logs": true
+    "no-phylo-debug-logs": false
     "test-crypto": false
   "ghc-lib-parser":
     "threaded-rts": true