Merge pull request #147 from openaire/add-second-ORCID-iD-range

Add a second ORCID iD range, which is mentioned in #146 , Thank you @jdvorak001
openaire · Jun 9, 2023 · 69ecae6 · 69ecae6
2 parents 8a79e45 + 63f4df0
commit 69ecae6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/docs/cerif_xml_person_entity.rst b/docs/cerif_xml_person_entity.rst
@@ -68,7 +68,7 @@ ORCID
 :Use: optional (0..1)
 :Representation: XML element ``ORCID``
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
-:Format: regular expression ``https://orcid\.org/0000-000(1-[5-9]|2-[0-9]|3-[0-4])[0-9]{3}-[0-9]{3}[0-9X]`` (as per `<https://support.orcid.org/knowledgebase/articles/116780-structure-of-the-orcid-identifier>`_)
+:Format: regular expression ``https://orcid\.org/000(0-000(1-[5-9]|2-[0-9]|3-[0-4])|9-000[0-9]-[0-9])[0-9]{3}-[0-9]{3}[0-9X]`` (as per `<https://support.orcid.org/knowledgebase/articles/116780-structure-of-the-orcid-identifier>`_)
 
 
 AlternativeORCID
@@ -77,7 +77,7 @@ AlternativeORCID
 :Use: optional, possibly multiple (0..*)
 :Representation: XML element ``AlternativeORCID``
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
-:Format: regular expression ``https://orcid\.org/0000-000(1-[5-9]|2-[0-9]|3-[0-4])[0-9]{3}-[0-9]{3}[0-9X]`` (as per `<https://support.orcid.org/knowledgebase/articles/116780-structure-of-the-orcid-identifier>`_)
+:Format: regular expression ``https://orcid\.org/000(0-000(1-[5-9]|2-[0-9]|3-[0-4])|9-000[0-9]-[0-9])[0-9]{3}-[0-9]{3}[0-9X]`` (as per `<https://support.orcid.org/knowledgebase/articles/116780-structure-of-the-orcid-identifier>`_)
 
 
 ResearcherID

diff --git a/samples/openaire_cerif_xml_example_persons.xml b/samples/openaire_cerif_xml_example_persons.xml
@@ -290,6 +290,24 @@
             </metadata>
         </record>
 
+        <record>
+            <header>
+                <identifier>oai:cris.example.org:Persons/2000001</identifier>
+                <datestamp>2018-01-07T14:00:00Z</datestamp>
+                <setSpec>openaire_cris_persons</setSpec>
+            </header>
+            <metadata>
+                <Person xmlns="https://www.openaire.eu/cerif-profile/1.1/" id="Persons/2000001">
+                	<!-- a sample person to demonstrate the second ISNI subrange assigned to ORCID -->
+                    <PersonName>
+                        <FamilyNames>mustermann</FamilyNames>
+                        <FirstNames>max</FirstNames>
+                    </PersonName>
+                    <ORCID>https://orcid.org/0009-0000-0000-0000</ORCID>
+                </Person>
+            </metadata>  
+        </record>
+
         <record>
             <header>
                 <identifier>oai:cris.example.org:Persons/2000002</identifier>

diff --git a/schemas/includes/person-identifiers.xsd b/schemas/includes/person-identifiers.xsd
@@ -119,7 +119,7 @@
 		</xs:annotation>
 		<xs:simpleContent>
 			<xs:restriction base="cfString__Type">
-				<xs:pattern value="https://orcid\.org/0000-000(1-[5-9]|2-[0-9]|3-[0-4])[0-9]{3}-[0-9]{3}[0-9X]">
+				<xs:pattern value="https://orcid\.org/000(0-000(1-[5-9]|2-[0-9]|3-[0-4])|9-000[0-9]-[0-9])[0-9]{3}-[0-9]{3}[0-9X]">
 					<xs:annotation>
 						<xs:documentation source="https://support.orcid.org/knowledgebase/articles/116780-structure-of-the-orcid-identifier"/>
 					</xs:annotation>