From e5240d76eb5dbcfe91745d42683e02de4ca75227 Mon Sep 17 00:00:00 2001 From: Dragan Ivanovic Date: Fri, 29 Nov 2019 12:18:10 +0100 Subject: [PATCH 01/29] orgunit identifiers added: ROR, GRID, FundRefRegistry ISNI identifier moved to cerif-base-identifiers.xsd, used in person-identifiers.xsd and orgunit-identifiers.xsd --- schemas/includes/cerif-base-identifiers.xsd | 21 +++ schemas/includes/orgunit-identifiers.xsd | 186 ++++++++++++++++++++ schemas/includes/person-identifiers.xsd | 27 +-- 3 files changed, 213 insertions(+), 21 deletions(-) create mode 100644 schemas/includes/orgunit-identifiers.xsd diff --git a/schemas/includes/cerif-base-identifiers.xsd b/schemas/includes/cerif-base-identifiers.xsd index cd5f949..d2e51eb 100644 --- a/schemas/includes/cerif-base-identifiers.xsd +++ b/schemas/includes/cerif-base-identifiers.xsd @@ -98,5 +98,26 @@ + + + + The XML Schema type for the ISNI identifier + + + The ISNI identifier + The identifiers assigned to persons, legal entities and other named objects. See http://www.isni.org/ for more details. + + + + + + + + + + + + + \ No newline at end of file diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd new file mode 100644 index 0000000..a4d3bdd --- /dev/null +++ b/schemas/includes/orgunit-identifiers.xsd @@ -0,0 +1,186 @@ + + + + This is the XML Schema component for the OpenAIRE CERIF profile 1.1 which specifies the admissible organisation units identifiers. + For further description please see the main schema file. + This work is licensed under a Creative Commons Attribution 4.0 International License (http://creativecommons.org/licenses/by/4.0/). + + + + + + The basic types of identifiers for use with schemas. + + + + + + The common building blocks for any CERIF XML Schema. + + + + + + + + + The ROR identifier in case its value is certain or known to be a preferred one. + + + + + The ROR identifiers in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. + + + + + + The GRID identifier in case its value is certain or known to be a preferred one. + + + + + The GRID identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. + + + + + + The ISNI identifier in case its value is certain or known to be a preferred one. + + + + + The ISNI identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. + + + + + + The FundRef Registry Identifier in case its value is certain or known to be a preferred one. + + + + + The FundRef Registry Identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. + + + + + + + + + + + The XML Schema type for the ROR identifier + + + The ROR identifier + The service of registering research organizations and assigning identifiers to them. See https://ror.org/about for more details. + + + + + + + + + + + + + + + + + The XML Schema type for the GRID identifier + + + The GRID identifier + The service of registering research organizations and assigning identifiers to them. See https://www.grid.ac/ for more details. + + + + + + + + + + + + + + + + + The XML Schema type for the FundRef Registry Identifier + + + The FundRef Registry Identifier + The service of registering funders and assigning identifiers to them. See https://www.crossref.org/services/funder-registry/ for more details. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/schemas/includes/person-identifiers.xsd b/schemas/includes/person-identifiers.xsd index 2d3dea6..e2d2a8d 100644 --- a/schemas/includes/person-identifiers.xsd +++ b/schemas/includes/person-identifiers.xsd @@ -8,6 +8,12 @@ + + + The basic types of identifiers for use with schemas. + + + The common building blocks for any CERIF XML Schema. @@ -156,27 +162,6 @@ - - - The XML Schema type for the ISNI identifier - - - The ISNI identifier - The identifiers assigned to persons, legal entities and other named objects. See http://www.isni.org/ for more details. - - - - - - - - - - - - - - The XML Schema type for the Digital Author Identifier From 41cf208789f3bb8ee74313a9caa778505c28f768 Mon Sep 17 00:00:00 2001 From: Dragan Ivanovic Date: Wed, 22 Jan 2020 10:34:52 +0100 Subject: [PATCH 02/29] Application of identifier naming convention ROR -> RORID FundRefRegistry -> FundRefID --- schemas/includes/orgunit-identifiers.xsd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd index a4d3bdd..51bdfcf 100644 --- a/schemas/includes/orgunit-identifiers.xsd +++ b/schemas/includes/orgunit-identifiers.xsd @@ -23,12 +23,12 @@ - + The ROR identifier in case its value is certain or known to be a preferred one. - + The ROR identifiers in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. @@ -56,12 +56,12 @@ - + The FundRef Registry Identifier in case its value is certain or known to be a preferred one. - + The FundRef Registry Identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. @@ -88,7 +88,7 @@ - + The XML Schema type for the ROR identifier @@ -130,7 +130,7 @@ - + The XML Schema type for the FundRef Registry Identifier From 4eba5fc460098c35a928056fb3f2365f440e7c0c Mon Sep 17 00:00:00 2001 From: Dragan Ivanovic Date: Thu, 13 Feb 2020 12:36:42 +0100 Subject: [PATCH 03/29] Small type corrections --- schemas/includes/orgunit-identifiers.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd index 51bdfcf..2742b44 100644 --- a/schemas/includes/orgunit-identifiers.xsd +++ b/schemas/includes/orgunit-identifiers.xsd @@ -61,7 +61,7 @@ The FundRef Registry Identifier in case its value is certain or known to be a preferred one. - + The FundRef Registry Identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. @@ -115,7 +115,7 @@ The GRID identifier - The service of registering research organizations and assigning identifiers to them. See https://www.grid.ac/ for more details. + The service of registering research objects and assigning identifiers to them. See https://www.grid.ac/ for more details. From 0d02074298d6db8ced16d472526a406c65b981cd Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 10:40:31 +0100 Subject: [PATCH 04/29] change gender urls --- schemas/openaire-cerif-profile.xsd | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 2eb1b6d..6cc2535 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -118,8 +118,7 @@ One Person typically has many of these relationships. Genders (sociocultural, not linguistic) - - Genders (sociocultural, not linguistic) + @@ -128,9 +127,7 @@ One Person typically has many of these relationships. Masculine - - Masculine - Man + @@ -139,9 +136,7 @@ One Person typically has many of these relationships. Feminine - - Feminine - Woman + From c56a8b8623dad3f2b19aff8dcdef48f9f441fdb2 Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 10:45:48 +0100 Subject: [PATCH 05/29] update funding originator urls --- schemas/openaire-cerif-profile.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 6cc2535..3372f3b 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -816,7 +816,7 @@ This entity typically represents the granularity level of a single published ite - + @@ -988,7 +988,7 @@ Source: Wikipedia - + @@ -1136,7 +1136,7 @@ This includes: - + From 6da6975abd2ccc8c46939badf82f0f800fdcbd10 Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 10:50:09 +0100 Subject: [PATCH 06/29] update organisation funding role url --- schemas/openaire-cerif-profile.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 3372f3b..f88eab2 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -559,7 +559,7 @@ The Project entity only captures details of the project scope and plan. Informat - + The funder or funders From 7a76abec789ea53daa096ec29938b1d2fe32878c Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 10:55:48 +0100 Subject: [PATCH 07/29] update language urls --- schemas/openaire-cerif-profile.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index f88eab2..4c4da53 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -657,7 +657,7 @@ This entity typically represents the granularity level of a single published ite - + The language of the publication. Please use the IETF language tags as described in the IETF BCP 47 document. @@ -1063,7 +1063,7 @@ This includes: - + The language or languages of the product, if applicable. Please use the IETF language tags as described in the IETF BCP 47 document. From 9895098f5102699be3d7d15e846e4ff9a34d681a Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 11:10:30 +0100 Subject: [PATCH 08/29] update inter output relations urls --- schemas/openaire-cerif-profile.xsd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 4c4da53..8eb2043 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -874,7 +874,7 @@ This entity typically represents the granularity level of a single published ite - + Result outputs that are referenced by this publication @@ -1000,7 +1000,7 @@ Source: Wikipedia - + Patents that precede (i.e., have priority over) this patent @@ -1015,7 +1015,7 @@ Source: Wikipedia - + Result outputs that are referenced by this patent @@ -1193,7 +1193,7 @@ This includes: - + Result outputs that are referenced by this product From c7d2bed568e8701bca0ef4c1d879e72c2ff768f1 Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 11:49:12 +0100 Subject: [PATCH 09/29] correct InterFundingRelations url (undisplayed character) --- schemas/openaire-cerif-profile.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 8eb2043..7f65b3c 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -565,7 +565,7 @@ The Project entity only captures details of the project scope and plan. Informat - + Chain up to the larger funding that encompasses this funding From c21c9c906791eaa88e127ad9964e1bde294075bf Mon Sep 17 00:00:00 2001 From: Laurent REMY Date: Tue, 3 Mar 2020 11:55:10 +0100 Subject: [PATCH 10/29] connect url for output-infrastructure relation url --- schemas/openaire-cerif-profile.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 7f65b3c..02ca53e 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -1148,7 +1148,7 @@ This includes: - + The equipment that generated this product From 90e15966db9d05c95a9a92ed8d4834c564709ebd Mon Sep 17 00:00:00 2001 From: lremy Date: Thu, 26 Mar 2020 10:57:02 +0100 Subject: [PATCH 11/29] update vocabulary to use for OpenAccess uri fon funding --- schemas/openaire-cerif-profile.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 02ca53e..389d0f2 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -600,7 +600,7 @@ The Project entity only captures details of the project scope and plan. Informat The flag if Open Access is mandated for this funding - + The Open Access policy that applies to this funding From d0d6eb8121094cc90f11b03d2e28c1d4f25e2d68 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 22 Oct 2020 20:44:06 +0200 Subject: [PATCH 12/29] Fix the identifiers (some case were not caught before) --- samples/openaire_cerif_xml_example_patents.xml | 2 +- samples/openaire_cerif_xml_example_projects.xml | 2 +- samples/openaire_cerif_xml_example_publications.xml | 6 +++--- samples/openaire_oaipmh_example_Identify.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/samples/openaire_cerif_xml_example_patents.xml b/samples/openaire_cerif_xml_example_patents.xml index 34533da..023d5b7 100644 --- a/samples/openaire_cerif_xml_example_patents.xml +++ b/samples/openaire_cerif_xml_example_patents.xml @@ -94,7 +94,7 @@ openaire_cris_patents - + http://purl.org/coar/resource_type/c_15cd MEDICAL DEVICE, IN PARTICULAR FOR THE SEPARATION OF A FLUID diff --git a/samples/openaire_cerif_xml_example_projects.xml b/samples/openaire_cerif_xml_example_projects.xml index 2fdff2c..1ac2ab4 100644 --- a/samples/openaire_cerif_xml_example_projects.xml +++ b/samples/openaire_cerif_xml_example_projects.xml @@ -15,7 +15,7 @@ openaire_cris_projects - + OpenAIREplus 2nd-Generation Open Access Infrastructure for Research in Europe 283595 diff --git a/samples/openaire_cerif_xml_example_publications.xml b/samples/openaire_cerif_xml_example_publications.xml index c8ef907..608acfe 100644 --- a/samples/openaire_cerif_xml_example_publications.xml +++ b/samples/openaire_cerif_xml_example_publications.xml @@ -152,7 +152,7 @@ openaire_cris_publications - + http://purl.org/coar/resource_type/c_0640 The International Journal of Digital Curation 1746-8256 @@ -168,7 +168,7 @@ openaire_cris_publications - + http://purl.org/coar/resource_type/c_3e5a The International Journal of Digital Curation: Special Issue on Open Access Repositories @@ -220,7 +220,7 @@ openaire_cris_publications - + http://purl.org/coar/resource_type/c_5794 en The Data Model of the OpenAIRE Scientific Communication e-Infrastructure diff --git a/samples/openaire_oaipmh_example_Identify.xml b/samples/openaire_oaipmh_example_Identify.xml index f2db3c7..ba5f7e4 100644 --- a/samples/openaire_oaipmh_example_Identify.xml +++ b/samples/openaire_oaipmh_example_Identify.xml @@ -28,7 +28,7 @@ - + https://www.openaire.eu/cerif-profile/vocab/OpenAIRE_Service_Compatibility#1.1 cris.example.org The example CRIS From 7dedc946d75e2dc52cdc742a86bc52a4f2be1b10 Mon Sep 17 00:00:00 2001 From: chenejac Date: Thu, 12 Nov 2020 11:45:01 +0100 Subject: [PATCH 13/29] Update orgunit-identifiers.xsd --- schemas/includes/orgunit-identifiers.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd index 2742b44..f3aa6b5 100644 --- a/schemas/includes/orgunit-identifiers.xsd +++ b/schemas/includes/orgunit-identifiers.xsd @@ -115,7 +115,7 @@ The GRID identifier - The service of registering research objects and assigning identifiers to them. See https://www.grid.ac/ for more details. + The service of registering research organizations and assigning identifiers to them. See https://www.grid.ac/ for more details. @@ -183,4 +183,4 @@ --> - \ No newline at end of file + From 7f8d1296197d3a6e5b5db9e6b9a1cbed5f9aacdc Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 12 Nov 2020 12:04:15 +0100 Subject: [PATCH 14/29] switch the order of imports (#60) --- schemas/openaire-cerif-profile.xsd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 389d0f2..4f242ee 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -43,17 +43,17 @@ - + -The product identifiers. +The patent identifiers. - - - The patent identifiers. - - + + +The product identifiers. + + From 900c5ff486f61e79ac49d1fe5c4171d2577bcf60 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 12 Nov 2020 13:25:23 +0100 Subject: [PATCH 15/29] add the gender vocabulary label and its terms --- schemas/openaire-cerif-profile.xsd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 4f242ee..023703a 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -119,6 +119,7 @@ One Person typically has many of these relationships. Genders (sociocultural, not linguistic) + Genders (sociocultural, not linguistic) @@ -128,6 +129,7 @@ One Person typically has many of these relationships. Masculine + Male @@ -137,6 +139,7 @@ One Person typically has many of these relationships. Feminine + Female From 68b0e5f00245cf086a1f2142ed3da2870ce154f1 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 12 Nov 2020 15:04:54 +0100 Subject: [PATCH 16/29] Corrections #73 https://w3id.org/cerif/vocab/OutputFundingRoles#Originator https://w3id.org/cerif/vocab/OrganisationFundingRoles#Financier https://w3id.org/cerif/vocab/InterOutputRelations#Reference https://w3id.org/cerif/vocab/OutputResearchInfrastructureRelations#Generation --- conf/openaire-cerif-profile.xml | 23 ++++++++++++++--------- schemas/openaire-cerif-profile.xsd | 6 +++--- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/conf/openaire-cerif-profile.xml b/conf/openaire-cerif-profile.xml index 12286cc..e18bc0f 100644 --- a/conf/openaire-cerif-profile.xml +++ b/conf/openaire-cerif-profile.xml @@ -33,17 +33,17 @@ OpenAIRE compatibility of the CRIS - + URL of the website of the CRIS - + Base URL for the OAI-PMH protocol endpoint of the CRIS - + The URL where the subject classification used by the CRIS can be obtained (using the HTTP GET) @@ -167,7 +167,7 @@ The event that is covered by this publication (e.g. a report about the event) - + Result outputs that are referenced by this publication @@ -190,7 +190,7 @@ The product identifiers. - + The equipment that generated this product @@ -205,7 +205,7 @@ The event that is covered by this product (e.g. a video or audio interview about the event) - + Result outputs that are referenced by this product @@ -217,18 +217,23 @@ - + The type of the patent (currently just one option) - + + + The patent identifiers. + + + Patents that precede (i.e., have priority over) this patent - + Result outputs that are referenced by this patent diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 023703a..6fcdd27 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -819,7 +819,7 @@ This entity typically represents the granularity level of a single published ite - + @@ -991,7 +991,7 @@ Source: Wikipedia - + @@ -1139,7 +1139,7 @@ This includes: - + From 034b925632be6a481c4cf66ed6a052913b677905 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 12 Nov 2020 21:09:42 +0100 Subject: [PATCH 17/29] backport the ROARMAP link (#94) --- conf/openaire-cerif-profile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/openaire-cerif-profile.xml b/conf/openaire-cerif-profile.xml index e18bc0f..42e1ff3 100644 --- a/conf/openaire-cerif-profile.xml +++ b/conf/openaire-cerif-profile.xml @@ -124,7 +124,7 @@ The flag if Open Access is mandated for this funding - + The Open Access policy that applies to this funding From f0946f23fc86b031b97e5808248e64a9cf86d14a Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Fri, 13 Nov 2020 11:21:10 +0100 Subject: [PATCH 18/29] use InterOutputRelations#Reference for instead of InterOutputRelations#Relation --- schemas/openaire-cerif-profile.xsd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 6fcdd27..28b11c4 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -877,7 +877,7 @@ This entity typically represents the granularity level of a single published ite - + Result outputs that are referenced by this publication @@ -1018,7 +1018,7 @@ Source: Wikipedia - + Result outputs that are referenced by this patent @@ -1196,7 +1196,7 @@ This includes: - + Result outputs that are referenced by this product From 9b354e9722e9635c08b3a94c4899ce37e3f9b498 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 14:13:23 +0100 Subject: [PATCH 19/29] #94 translates the effects of the backports on the documentation --- docs/cerif_xml_funding_entity.rst | 4 ++-- docs/cerif_xml_patent_entity.rst | 4 ++-- docs/cerif_xml_person_entity.rst | 4 ++-- docs/cerif_xml_product_entity.rst | 6 +++--- docs/cerif_xml_publication_entity.rst | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/cerif_xml_funding_entity.rst b/docs/cerif_xml_funding_entity.rst index ba07011..3c9e33e 100644 --- a/docs/cerif_xml_funding_entity.rst +++ b/docs/cerif_xml_funding_entity.rst @@ -101,7 +101,7 @@ Funder :Description: The funder or funders :Use: optional, possibly multiple (0..*) :Representation: XML element ``Funder`` with embedded XML element ``OrgUnit`` or ``Person``. A ``DisplayName`` may be specified, too. -:CERIF: the OrganisationUnit_Funding linking entity (``_) with the ``_ semantics +:CERIF: the OrganisationUnit_Funding linking entity (``_) with the ``_ semantics PartOf @@ -109,7 +109,7 @@ PartOf :Description: Chain up to the larger funding that encompasses this funding :Use: optional (0..1) :Representation: XML element ``PartOf`` with embedded XML element ``Funding`` -:CERIF: the Funding_Funding linking entity (``_) with the ``_ semantics (direction :1) +:CERIF: the Funding_Funding linking entity (``_) with the ``_ semantics (direction :1) Duration diff --git a/docs/cerif_xml_patent_entity.rst b/docs/cerif_xml_patent_entity.rst index ad625d3..2b0ea84 100644 --- a/docs/cerif_xml_patent_entity.rst +++ b/docs/cerif_xml_patent_entity.rst @@ -155,7 +155,7 @@ OriginatesFrom ^^^^^^^^^^^^^^ :Use: optional, possibly multiple (0..*) :Representation: XML element ``OriginatesFrom`` with embedded XML element ``Project`` or ``Funding`` -:CERIF: the Project_ResultPatent linking entity (``_) with the ``_ semantics; the ResultPatent_Funding linking entity (``_) with the ``_ semantics +:CERIF: the Project_ResultPatent linking entity (``_) with the ``_ semantics; the ResultPatent_Funding linking entity (``_) with the ``_ semantics Predecessor @@ -163,7 +163,7 @@ Predecessor :Description: Patents that precede (i.e., have priority over) this patent :Use: optional, possibly multiple (0..*) :Representation: XML element ``Predecessor`` with embedded XML element ``Patent`` -:CERIF: the ResultPatent_ResultPatent linking entity (``_) with the ``_ semantics (direction :1) +:CERIF: the ResultPatent_ResultPatent linking entity (``_) with the ``_ semantics (direction :1) References diff --git a/docs/cerif_xml_person_entity.rst b/docs/cerif_xml_person_entity.rst index 10c140f..010f949 100644 --- a/docs/cerif_xml_person_entity.rst +++ b/docs/cerif_xml_person_entity.rst @@ -57,8 +57,8 @@ Gender :CERIF: the Person.Gender attribute (``_) :Vocabulary: Genders (sociocultural, not linguistic) - * **Masculine** (``m``): Man - * **Feminine** (``f``): Woman + * **Masculine** (``m``): + * **Feminine** (``f``): diff --git a/docs/cerif_xml_product_entity.rst b/docs/cerif_xml_product_entity.rst index a28a2e8..8a84edb 100644 --- a/docs/cerif_xml_product_entity.rst +++ b/docs/cerif_xml_product_entity.rst @@ -51,7 +51,7 @@ Language :Description: The language or languages of the product, if applicable. Please use the IETF language tags as described in the IETF BCP 47 document. :Use: optional, possibly multiple (0..*) :Representation: XML element ``Language`` -:CERIF: the ResultProduct_Classification linking entity (``_) with the ``_ semantics +:CERIF: the ResultProduct_Classification linking entity (``_) with the ``_ semantics Name @@ -187,7 +187,7 @@ OriginatesFrom ^^^^^^^^^^^^^^ :Use: optional, possibly multiple (0..*) :Representation: XML element ``OriginatesFrom`` with embedded XML element ``Project`` or ``Funding`` -:CERIF: the Project_ResultProduct linking entity (``_) with the ``_ semantics; the ResultProduct_Funding linking entity (``_) with the ``_ semantics +:CERIF: the Project_ResultProduct linking entity (``_) with the ``_ semantics; the ResultProduct_Funding linking entity (``_) with the ``_ semantics GeneratedBy @@ -195,7 +195,7 @@ GeneratedBy :Description: The equipment that generated this product :Use: optional, possibly multiple (0..*) :Representation: XML element ``GeneratedBy`` with embedded XML element ``Equipment`` -:CERIF: the ResultProduct_Equipment linking entity (``_) with the ``_ semantics +:CERIF: the ResultProduct_Equipment linking entity (``_) with the ``_ semantics PresentedAt diff --git a/docs/cerif_xml_publication_entity.rst b/docs/cerif_xml_publication_entity.rst index f202037..7431076 100644 --- a/docs/cerif_xml_publication_entity.rst +++ b/docs/cerif_xml_publication_entity.rst @@ -86,7 +86,7 @@ Language :Description: The language of the publication. Please use the IETF language tags as described in the IETF BCP 47 document. :Use: optional (0..1) :Representation: XML element ``Language`` -:CERIF: the ResultPublication_Classification linking entity (``_) with the ``_ semantics +:CERIF: the ResultPublication_Classification linking entity (``_) with the ``_ semantics Title @@ -413,7 +413,7 @@ OriginatesFrom ^^^^^^^^^^^^^^ :Use: optional, possibly multiple (0..*) :Representation: XML element ``OriginatesFrom`` with embedded XML element ``Project`` or ``Funding`` -:CERIF: the Project_ResultPublication linking entity (``_) with the ``_ semantics; the ResultPublication_Funding linking entity (``_) with the ``_ semantics +:CERIF: the Project_ResultPublication linking entity (``_) with the ``_ semantics; the ResultPublication_Funding linking entity (``_) with the ``_ semantics PresentedAt From 8e8464a20bfc6ae53824c5717f91d4889f78c1cd Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 18:22:05 +0100 Subject: [PATCH 20/29] #94 backport the regexp change into documentation --- docs/cerif_xml_person_entity.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cerif_xml_person_entity.rst b/docs/cerif_xml_person_entity.rst index 010f949..37b63c9 100644 --- a/docs/cerif_xml_person_entity.rst +++ b/docs/cerif_xml_person_entity.rst @@ -128,7 +128,7 @@ ISNI :Use: optional (0..1) :Representation: XML element ``ISNI`` :CERIF: the FederatedIdentifier entity (``_) -:Format: regular expression ``[0-9]{4} [0-9]{4} [0-9]{4} [0-9]{3}[0-9X]`` (as per ``_) +:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per ``_) @@ -138,7 +138,7 @@ AlternativeISNI :Use: optional, possibly multiple (0..*) :Representation: XML element ``AlternativeISNI`` :CERIF: the FederatedIdentifier entity (``_) -:Format: regular expression ``[0-9]{4} [0-9]{4} [0-9]{4} [0-9]{3}[0-9X]`` (as per ``_) +:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per ``_) From df5b2a2a672ee571db6e5ba50aa65e532bdb8ff9 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 18:23:21 +0100 Subject: [PATCH 21/29] #76 support multiple xs:documentation/@source --- schemas/scripts/xsd2cerif-rst.xsl | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/schemas/scripts/xsd2cerif-rst.xsl b/schemas/scripts/xsd2cerif-rst.xsl index 59be91d..b29850f 100644 --- a/schemas/scripts/xsd2cerif-rst.xsl +++ b/schemas/scripts/xsd2cerif-rst.xsl @@ -201,19 +201,24 @@ Internal Identifier - - - - `< - - >`_ - - - `` - - `` - - + + + + + + + + `< + + >`_ + + + `` + + `` + + + From 87756360c67aed27072514f6e3dfd36cbd540bd0 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 18:24:11 +0100 Subject: [PATCH 22/29] #76 plug in the specific orgunit identifer elements --- conf/openaire-cerif-profile.xml | 7 +- docs/cerif_xml_organisation_entity.rst | 85 +++++++++++++++++++++++- schemas/includes/orgunit-identifiers.xsd | 7 ++ schemas/openaire-cerif-profile.xsd | 12 ++-- 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/conf/openaire-cerif-profile.xml b/conf/openaire-cerif-profile.xml index 42e1ff3..d8a2a24 100644 --- a/conf/openaire-cerif-profile.xml +++ b/conf/openaire-cerif-profile.xml @@ -1,5 +1,5 @@ - + This is the XML Schema for the OpenAIRE CERIF profile 1.1, a companion artifact of the OpenAIRE Guidelines for CRIS Managers 1.1 (http://openaire-guidelines-for-cris-managers.readthedocs.io/en/latest/index.html). @@ -71,6 +71,11 @@ + + + The orgunit identifiers. + + diff --git a/docs/cerif_xml_organisation_entity.rst b/docs/cerif_xml_organisation_entity.rst index 85c8182..7f3c5f6 100644 --- a/docs/cerif_xml_organisation_entity.rst +++ b/docs/cerif_xml_organisation_entity.rst @@ -42,12 +42,91 @@ Name +RORID +^^^^^ +:Description: The ROR identifier in case its value is certain or known to be a preferred one. +:Use: optional (0..1) +:Representation: XML element ``RORID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``https:\/\/ror\.org\/0[\da-hj-km-np-tv-zA-HJ-KM-NP-TV-Z]{6}\d{2}`` (as per ``_) + + + +AlternativeRORID +^^^^^^^^^^^^^^^^ +:Description: The ROR identifiers in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. +:Use: optional, possibly multiple (0..*) +:Representation: XML element ``AlternativeRORID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``https:\/\/ror\.org\/0[\da-hj-km-np-tv-zA-HJ-KM-NP-TV-Z]{6}\d{2}`` (as per ``_) + + + +GRID +^^^^ +:Description: The GRID identifier in case its value is certain or known to be a preferred one. +:Use: optional (0..1) +:Representation: XML element ``GRID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``grid\.\d{4,}\.[0-9a-f]{1,2}`` (as per ``_) + + + +AlternativeGRID +^^^^^^^^^^^^^^^ +:Description: The GRID identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. +:Use: optional, possibly multiple (0..*) +:Representation: XML element ``AlternativeGRID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``grid\.\d{4,}\.[0-9a-f]{1,2}`` (as per ``_) + + + +ISNI +^^^^ +:Description: The ISNI identifier in case its value is certain or known to be a preferred one. +:Use: optional (0..1) +:Representation: XML element ``ISNI`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per ``_) + + + +AlternativeISNI +^^^^^^^^^^^^^^^ +:Description: The ISNI identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. +:Use: optional, possibly multiple (0..*) +:Representation: XML element ``AlternativeISNI`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per ``_) + + + +FundRefID +^^^^^^^^^ +:Description: The FundRef Registry Identifier in case its value is certain or known to be a preferred one. +:Use: optional (0..1) +:Representation: XML element ``FundRefID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``https:\/\/doi.org\/10\.13039\/\d+`` (as per ``_ ``_) + + + +AlternativeFundRefID +^^^^^^^^^^^^^^^^^^^^ +:Description: The FundRef Registry Identifier in case the value is not certain, e.g. because there is a conflicting statement with a different value. This can also represent deprecated identifiers/profiles that have been merged into a single, current one that is preferred. +:Use: optional, possibly multiple (0..*) +:Representation: XML element ``AlternativeFundRefID`` +:CERIF: the FederatedIdentifier entity (``_) +:Format: regular expression ``https:\/\/doi.org\/10\.13039\/\d+`` (as per ``_ ``_) + + + Identifier ^^^^^^^^^^ -:Description: An identifier of the organisation unit +:Description: A generic identifier, to be used only if your identifier does not fit in any of the above specific identifier types. :Use: optional, possibly multiple (0..*) -:Representation: XML element ``Identifier`` with mandatory ``type`` attribute -:CERIF: the FederatedIdentifier entity (``_) +:Representation: XML element ``Identifier`` diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd index f3aa6b5..07e039d 100644 --- a/schemas/includes/orgunit-identifiers.xsd +++ b/schemas/includes/orgunit-identifiers.xsd @@ -85,6 +85,13 @@ --> + + + + A generic identifier, to be used only if your identifier does not fit in any of the above specific identifier types. + + + diff --git a/schemas/openaire-cerif-profile.xsd b/schemas/openaire-cerif-profile.xsd index 28b11c4..6befa8d 100644 --- a/schemas/openaire-cerif-profile.xsd +++ b/schemas/openaire-cerif-profile.xsd @@ -35,6 +35,12 @@ The person identifiers. + + + + +The orgunit identifiers. + @@ -217,11 +223,7 @@ In the research information domain Organisation Units typically represents: - - - An identifier of the organisation unit - - + From 0089a89edac20a457dd91c5a3b119611ed05a8c2 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 18:25:29 +0100 Subject: [PATCH 23/29] #76 adapt the examples (FundRefID) --- samples/openaire_cerif_xml_example_fundings.xml | 4 ++-- samples/openaire_cerif_xml_example_orgunits.xml | 2 +- samples/openaire_cerif_xml_example_projects.xml | 6 +++--- samples/openaire_cerif_xml_example_publications.xml | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/openaire_cerif_xml_example_fundings.xml b/samples/openaire_cerif_xml_example_fundings.xml index bdde93c..473277a 100644 --- a/samples/openaire_cerif_xml_example_fundings.xml +++ b/samples/openaire_cerif_xml_example_fundings.xml @@ -30,7 +30,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 @@ -57,7 +57,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 diff --git a/samples/openaire_cerif_xml_example_orgunits.xml b/samples/openaire_cerif_xml_example_orgunits.xml index ee44f5e..652930f 100644 --- a/samples/openaire_cerif_xml_example_orgunits.xml +++ b/samples/openaire_cerif_xml_example_orgunits.xml @@ -102,7 +102,7 @@ Euroopan komissio Europeiska kommissionen Europska komisija - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 https://europa.eu/ diff --git a/samples/openaire_cerif_xml_example_projects.xml b/samples/openaire_cerif_xml_example_projects.xml index cef7845..7ae63e0 100644 --- a/samples/openaire_cerif_xml_example_projects.xml +++ b/samples/openaire_cerif_xml_example_projects.xml @@ -43,7 +43,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 @@ -127,7 +127,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 @@ -203,7 +203,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 diff --git a/samples/openaire_cerif_xml_example_publications.xml b/samples/openaire_cerif_xml_example_publications.xml index 149c98b..d985be3 100644 --- a/samples/openaire_cerif_xml_example_publications.xml +++ b/samples/openaire_cerif_xml_example_publications.xml @@ -130,7 +130,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 @@ -201,8 +201,8 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 - + https://doi.org/10.13039/501100000780 + @@ -338,7 +338,7 @@ EC European Commission - http://dx.doi.org/10.13039/501100000780 + https://doi.org/10.13039/501100000780 From 5f41535780d3f5b473ced47a7dd51f6a7dae16f2 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 18:32:01 +0100 Subject: [PATCH 24/29] #94 backport #65 --- samples/openaire_cerif_xml_example_publications.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/samples/openaire_cerif_xml_example_publications.xml b/samples/openaire_cerif_xml_example_publications.xml index d985be3..3492445 100644 --- a/samples/openaire_cerif_xml_example_publications.xml +++ b/samples/openaire_cerif_xml_example_publications.xml @@ -155,7 +155,9 @@ http://purl.org/coar/resource_type/c_0640 The International Journal of Digital Curation + IJDC 1746-8256 + 2266735-0 http://purl.org/coar/access_right/c_14cb From c2e83956f6501bce1adb1dd79439eceefe3ba532 Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 22:20:04 +0100 Subject: [PATCH 25/29] #78 add the ./tools/compile.sh script and call it from .travis.yml --- .travis.yml | 3 +-- tools/compile.sh | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100755 tools/compile.sh diff --git a/.travis.yml b/.travis.yml index 39b85ab..d48c1eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,5 +10,4 @@ jdk: install: true script: - # this runs two Maven goals: transform and validate - - travis_wait mvn test -B \ No newline at end of file + - travis_wait ./tools/compile.sh diff --git a/tools/compile.sh b/tools/compile.sh new file mode 100755 index 0000000..878a292 --- /dev/null +++ b/tools/compile.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +echo '================================================================================' +echo '* Compiling the CERIF-Model-Tools *' +echo '================================================================================' +( cd ../CERIF-TG-Tools/CERIF-Model-Tools/ && mvn package ) + +echo +echo '================================================================================' +echo '* Running the CERIF-Model-Tools *' +echo '================================================================================' +java -jar ../CERIF-TG-Tools/CERIF-Model-Tools/target/cerif-model-tools-*.jar -d conf/openaire-cerif-profile.xml -o schemas/openaire-cerif-profile.xsd + +echo +echo '================================================================================' +echo '* Validating files and producing documentation sources *' +echo '================================================================================' + +# extract the current version from the POM file +V=$( xpath /dev/null | \ + sed -ne '//s/<\/*version>//gp' ) + +# place the current version in the documentation config file +echo >docs/conf.sed "/^release/c\\ +release = '$V'" && \ +sed -f docs/conf.sed docs/conf.py >docs/conf1.py && \ +mv docs/conf1.py docs/conf.py || \ +exit 1 + +# run the maven script +mvn -B clean package || \ +exit 2 + +echo +echo '================================================================================' +echo '* Running the Prototype OpenAIRE Validator *' +echo '================================================================================' +( cd ../openaire-cris-validator/ && mvn clean package ) From 1655004b8e756f1f591bc10433c461fdc7903ebd Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Thu, 19 Nov 2020 22:27:11 +0100 Subject: [PATCH 26/29] #78 checkout also the necessary modules - CERIF-TG-Tools - openaire-cris-validator --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index d48c1eb..11551f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false +before_install: +- git clone https://github.com/eurocris/CERIF-TG-Tools.git ../CERIF-TG-Tools +- git clone https://github.com/jdvorak001/openaire-cris-validator.git ../openaire-cris-validator + language: java jdk: From 716eb6d4441c46394bde3ba10ffcbeb38d94b26a Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Fri, 20 Nov 2020 10:59:45 +0100 Subject: [PATCH 27/29] #78 introduce an error to be discovered by the validator --- samples/openaire_cerif_xml_example_orgunits.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/openaire_cerif_xml_example_orgunits.xml b/samples/openaire_cerif_xml_example_orgunits.xml index 652930f..37f9e02 100644 --- a/samples/openaire_cerif_xml_example_orgunits.xml +++ b/samples/openaire_cerif_xml_example_orgunits.xml @@ -20,7 +20,7 @@ NKUA ΕΘΝΙΚΟ ΚΑΙ ΚΑΠΟΔΙΣΤΡΙΑΚΟ ΠΑΝΕΠΙΣΤΗΜΙΟ ΑΘΗΝΩΝ NATIONAL AND KAPODISTRIAN UNIVERSITY OF ATHENS - http://www.uoa.gr + http://www.uoa.gr @@ -36,7 +36,7 @@ CNR CONSIGLIO NAZIONALE DELLE RICERCHE NATIONAL RESEARCH COUNCIL - http://www.cnr.it + http://www.cnr.it @@ -103,7 +103,7 @@ Europeiska kommissionen Europska komisija https://doi.org/10.13039/501100000780 - https://europa.eu/ + https://europa.eu/ From 45938f4e0e715490664c51472c7ab338d430e55e Mon Sep 17 00:00:00 2001 From: jdvorak001 Date: Fri, 20 Nov 2020 13:04:43 +0100 Subject: [PATCH 28/29] #78 corrects the error And uses the more fitting ElectronicAddress for organisations' websites. --- samples/openaire_cerif_xml_example_orgunits.xml | 4 ++-- samples/openaire_cerif_xml_example_projects.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/openaire_cerif_xml_example_orgunits.xml b/samples/openaire_cerif_xml_example_orgunits.xml index 37f9e02..b7b47b7 100644 --- a/samples/openaire_cerif_xml_example_orgunits.xml +++ b/samples/openaire_cerif_xml_example_orgunits.xml @@ -51,7 +51,7 @@ EKT National Documentation Centre Εθνικό Κέντρο Τεκμηρίωσης - http://www.ekt.gr + http://www.ekt.gr @@ -65,7 +65,7 @@ UKOLN UKOLN - http://www.ukoln.ac.uk + http://www.ukoln.ac.uk diff --git a/samples/openaire_cerif_xml_example_projects.xml b/samples/openaire_cerif_xml_example_projects.xml index 7ae63e0..5d33546 100644 --- a/samples/openaire_cerif_xml_example_projects.xml +++ b/samples/openaire_cerif_xml_example_projects.xml @@ -194,7 +194,7 @@ CNR CONSIGLIO NAZIONALE DELLE RICERCHE NATIONAL RESEARCH COUNCIL - http://www.cnr.it + http://www.cnr.it From be7f44bc97a39e43995b494247a675970cd897de Mon Sep 17 00:00:00 2001 From: Jan Dvorak Date: Fri, 20 Nov 2020 14:06:46 +0100 Subject: [PATCH 29/29] Make a total compile script (#96) * #78 add the ./tools/compile.sh script and call it from .travis.yml * #78 checkout also the necessary modules (CERIF-TG-Tools, openaire-cris-validator) * #78 introduce an error to be discovered by the validator * #78 corrects the error (and uses the more fitting ElectronicAddress for organisations' websites) --- .travis.yml | 7 +++- .../openaire_cerif_xml_example_orgunits.xml | 10 ++--- .../openaire_cerif_xml_example_projects.xml | 2 +- tools/compile.sh | 38 +++++++++++++++++++ 4 files changed, 49 insertions(+), 8 deletions(-) create mode 100755 tools/compile.sh diff --git a/.travis.yml b/.travis.yml index 39b85ab..11551f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false +before_install: +- git clone https://github.com/eurocris/CERIF-TG-Tools.git ../CERIF-TG-Tools +- git clone https://github.com/jdvorak001/openaire-cris-validator.git ../openaire-cris-validator + language: java jdk: @@ -10,5 +14,4 @@ jdk: install: true script: - # this runs two Maven goals: transform and validate - - travis_wait mvn test -B \ No newline at end of file + - travis_wait ./tools/compile.sh diff --git a/samples/openaire_cerif_xml_example_orgunits.xml b/samples/openaire_cerif_xml_example_orgunits.xml index 652930f..b7b47b7 100644 --- a/samples/openaire_cerif_xml_example_orgunits.xml +++ b/samples/openaire_cerif_xml_example_orgunits.xml @@ -20,7 +20,7 @@ NKUA ΕΘΝΙΚΟ ΚΑΙ ΚΑΠΟΔΙΣΤΡΙΑΚΟ ΠΑΝΕΠΙΣΤΗΜΙΟ ΑΘΗΝΩΝ NATIONAL AND KAPODISTRIAN UNIVERSITY OF ATHENS - http://www.uoa.gr + http://www.uoa.gr @@ -36,7 +36,7 @@ CNR CONSIGLIO NAZIONALE DELLE RICERCHE NATIONAL RESEARCH COUNCIL - http://www.cnr.it + http://www.cnr.it @@ -51,7 +51,7 @@ EKT National Documentation Centre Εθνικό Κέντρο Τεκμηρίωσης - http://www.ekt.gr + http://www.ekt.gr @@ -65,7 +65,7 @@ UKOLN UKOLN - http://www.ukoln.ac.uk + http://www.ukoln.ac.uk @@ -103,7 +103,7 @@ Europeiska kommissionen Europska komisija https://doi.org/10.13039/501100000780 - https://europa.eu/ + https://europa.eu/ diff --git a/samples/openaire_cerif_xml_example_projects.xml b/samples/openaire_cerif_xml_example_projects.xml index 7ae63e0..5d33546 100644 --- a/samples/openaire_cerif_xml_example_projects.xml +++ b/samples/openaire_cerif_xml_example_projects.xml @@ -194,7 +194,7 @@ CNR CONSIGLIO NAZIONALE DELLE RICERCHE NATIONAL RESEARCH COUNCIL - http://www.cnr.it + http://www.cnr.it diff --git a/tools/compile.sh b/tools/compile.sh new file mode 100755 index 0000000..878a292 --- /dev/null +++ b/tools/compile.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +echo '================================================================================' +echo '* Compiling the CERIF-Model-Tools *' +echo '================================================================================' +( cd ../CERIF-TG-Tools/CERIF-Model-Tools/ && mvn package ) + +echo +echo '================================================================================' +echo '* Running the CERIF-Model-Tools *' +echo '================================================================================' +java -jar ../CERIF-TG-Tools/CERIF-Model-Tools/target/cerif-model-tools-*.jar -d conf/openaire-cerif-profile.xml -o schemas/openaire-cerif-profile.xsd + +echo +echo '================================================================================' +echo '* Validating files and producing documentation sources *' +echo '================================================================================' + +# extract the current version from the POM file +V=$( xpath /dev/null | \ + sed -ne '//s/<\/*version>//gp' ) + +# place the current version in the documentation config file +echo >docs/conf.sed "/^release/c\\ +release = '$V'" && \ +sed -f docs/conf.sed docs/conf.py >docs/conf1.py && \ +mv docs/conf1.py docs/conf.py || \ +exit 1 + +# run the maven script +mvn -B clean package || \ +exit 2 + +echo +echo '================================================================================' +echo '* Running the Prototype OpenAIRE Validator *' +echo '================================================================================' +( cd ../openaire-cris-validator/ && mvn clean package )