diff --git a/loterre-resolvers/v1/9SD/expand.ini b/loterre-resolvers/v1/9SD/expand.ini index fd459ee..36c465d 100644 --- a/loterre-resolvers/v1/9SD/expand.ini +++ b/loterre-resolvers/v1/9SD/expand.ini @@ -16,7 +16,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-pays.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-pays.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/loterre-resolvers/v1/9SD/identify.ini b/loterre-resolvers/v1/9SD/identify.ini index 408eb15..8b9acb0 100644 --- a/loterre-resolvers/v1/9SD/identify.ini +++ b/loterre-resolvers/v1/9SD/identify.ini @@ -28,7 +28,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-pays.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-pays.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/loterre-resolvers/v1/D63/expand.ini b/loterre-resolvers/v1/D63/expand.ini index 13dbb05..2dde62e 100644 --- a/loterre-resolvers/v1/D63/expand.ini +++ b/loterre-resolvers/v1/D63/expand.ini @@ -16,7 +16,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-communes.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-communes.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/loterre-resolvers/v1/D63/identify.ini b/loterre-resolvers/v1/D63/identify.ini index 17874f9..901d22e 100644 --- a/loterre-resolvers/v1/D63/identify.ini +++ b/loterre-resolvers/v1/D63/identify.ini @@ -28,7 +28,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-communes.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-communes.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/loterre-resolvers/v1/P66/expand.ini b/loterre-resolvers/v1/P66/expand.ini index a7c058c..e375d6b 100644 --- a/loterre-resolvers/v1/P66/expand.ini +++ b/loterre-resolvers/v1/P66/expand.ini @@ -174,7 +174,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-memoire.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-memoire.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/loterre-resolvers/v1/P66/identify.ini b/loterre-resolvers/v1/P66/identify.ini index 47f0199..542851b 100644 --- a/loterre-resolvers/v1/P66/identify.ini +++ b/loterre-resolvers/v1/P66/identify.ini @@ -35,7 +35,8 @@ [env] path = primer -value = https://inist-wsdata.dboard.inist.fr/loterre-resolvers-memoire.xml +value = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("loterre-resolvers-memoire.xml").join("") path = weekNumber value = thru(() => new Date()).thru(currentDate => Math.floor((currentDate - (new Date(currentDate.getFullYear(), 0, 1)))/(24 * 60 * 60 * 1000))).thru(days => Math.ceil(days / 7)) diff --git a/mapping-tools/README.md b/mapping-tools/README.md index dbd6c6e..c943f50 100644 --- a/mapping-tools/README.md +++ b/mapping-tools/README.md @@ -19,14 +19,30 @@ ```json { "packages": [ - "@ezs/core@2.1.1", - "@ezs/analytics@2.0.3", - "@ezs/basics@1.22.3" + "@ezs/core@2.1.2", + "@ezs/analytics@2.0.4", + "@ezs/basics@1.22.4" ] } ``` -Exemple +Il est impératif d'ajouter, dans la partie `environment` de la configuration, +une variable `TABLE_SERVER_URL` pointant vers la racine du serveur statique des +tables de correspondances. + +Par défaut, elle vaut `https://inist-wsdata.dboard.inist.fr/`, qui n'est qu'une +machine d'essai, dont la pérennité n'est pas garantie. + +```json +{ + "environnement": { + "EZS_TITLE": "Mapping tools", + "EZS_DESCRIPTION": "Outils de mise en correspondance", + ... + "TABLE_SERVER_URL": "http://mapping-tables.daf.intra.inist.fr/" + } +} +``` ## Utilisation diff --git a/mapping-tools/v1/apc/2018/doi.ini b/mapping-tools/v1/apc/2018/doi.ini index b75ec4e..5efb2ec 100644 --- a/mapping-tools/v1/apc/2018/doi.ini +++ b/mapping-tools/v1/apc/2018/doi.ini @@ -33,7 +33,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/apc-2018-doi.csv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("apc-2018-doi.csv").join("") file = ./apc-2018-doi.ini [assign] diff --git a/mapping-tools/v1/halAuthorId/idRef/json.ini b/mapping-tools/v1/halAuthorId/idRef/json.ini index d1c8050..3fbaf82 100644 --- a/mapping-tools/v1/halAuthorId/idRef/json.ini +++ b/mapping-tools/v1/halAuthorId/idRef/json.ini @@ -32,7 +32,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/halauthorid-idref-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("halauthorid-idref-json.tsv").join("") file = ./halauthorid-idref-json.ini [assign] diff --git a/mapping-tools/v1/homogenize/documentType/json.ini b/mapping-tools/v1/homogenize/documentType/json.ini index 8369a27..401c27c 100644 --- a/mapping-tools/v1/homogenize/documentType/json.ini +++ b/mapping-tools/v1/homogenize/documentType/json.ini @@ -27,7 +27,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/homogenize-documenttype-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("homogenize-documenttype-json.tsv").join("") file = ./homogenize-documenttype-json.ini [assign] diff --git a/mapping-tools/v1/homogenize/publisher/json.ini b/mapping-tools/v1/homogenize/publisher/json.ini index 5a0b63f..327fd1c 100644 --- a/mapping-tools/v1/homogenize/publisher/json.ini +++ b/mapping-tools/v1/homogenize/publisher/json.ini @@ -27,7 +27,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/homogenize-publisher-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("homogenize-publisher-json.tsv").join("") file = ./homogenize-publisher-json.ini [assign] diff --git a/mapping-tools/v1/homogenize/source/json.ini b/mapping-tools/v1/homogenize/source/json.ini index fca9f08..fb1a247 100644 --- a/mapping-tools/v1/homogenize/source/json.ini +++ b/mapping-tools/v1/homogenize/source/json.ini @@ -27,7 +27,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/homogenize-source-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("homogenize-source-json.tsv").join("") file = ./homogenize-source-json.ini [assign] diff --git a/mapping-tools/v1/idRef/orcid/json.ini b/mapping-tools/v1/idRef/orcid/json.ini index 1f9b3a0..2cb61c0 100644 --- a/mapping-tools/v1/idRef/orcid/json.ini +++ b/mapping-tools/v1/idRef/orcid/json.ini @@ -28,7 +28,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/idref-orcid-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("idref-orcid-json.tsv").join("") file = ./idref-orcid-json.ini [assign] diff --git a/mapping-tools/v1/inspire-category/meta-category/json.ini b/mapping-tools/v1/inspire-category/meta-category/json.ini index ee09a6b..62500c1 100644 --- a/mapping-tools/v1/inspire-category/meta-category/json.ini +++ b/mapping-tools/v1/inspire-category/meta-category/json.ini @@ -38,7 +38,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/inspire-category-meta-category-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("inspire-category-meta-category-json.tsv").join("") file = ./inspire-category-meta-category-json.ini [assign] diff --git a/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini b/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini index e9dfa07..6f1c8b6 100644 --- a/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini +++ b/mapping-tools/v1/inspire-labos/in2p3-labos/json.ini @@ -38,7 +38,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/inspire-labos-in2p3-labos-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("inspire-labos-in2p3-labos-json.tsv").join("") file = ./inspire-labos-in2p3-labos-json.ini [assign] diff --git a/mapping-tools/v1/rnsr/instituts-cnrs/json.ini b/mapping-tools/v1/rnsr/instituts-cnrs/json.ini index 66d3f37..5702c97 100644 --- a/mapping-tools/v1/rnsr/instituts-cnrs/json.ini +++ b/mapping-tools/v1/rnsr/instituts-cnrs/json.ini @@ -23,7 +23,8 @@ [expand/combine] path = value default = n/a -primer = https://inist-wsdata.dboard.inist.fr/rnsr-instituts-cnrs-json.tsv +primer = env("TABLE_SERVER_URL", "https://inist-wsdata.dboard.inist.fr/") \ + .concat("rnsr-instituts-cnrs-json.tsv").join("") file = ./rnsr-instituts-cnrs-json.ini [assign]