Merge pull request #148 from openaire/add-generic-Person-identifier

Add generic Person identifier
openaire · Jun 9, 2023 · 8a79e45 · 8a79e45
2 parents b550990 + 810c14d
commit 8a79e45
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 7 deletions.
diff --git a/docs/cerif_xml_equipment_entity.rst b/docs/cerif_xml_equipment_entity.rst
@@ -46,7 +46,7 @@ Identifier
 ^^^^^^^^^^
 :Description: An identifier of this equipment
 :Use: optional, possibly multiple (0..*)
-:Representation: XML element ``Identifier`` with mandatory ``type`` attribute
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
 
 

diff --git a/docs/cerif_xml_funding_entity.rst b/docs/cerif_xml_funding_entity.rst
@@ -65,7 +65,7 @@ Identifier
 ^^^^^^^^^^
 :Description: An identifier of the funding
 :Use: optional, possibly multiple (0..*)
-:Representation: XML element ``Identifier`` with mandatory ``type`` attribute
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
 
 

diff --git a/docs/cerif_xml_organisation_entity.rst b/docs/cerif_xml_organisation_entity.rst
@@ -118,7 +118,8 @@ Identifier
 ^^^^^^^^^^
 :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``
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
+:CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
 
 
 

diff --git a/docs/cerif_xml_person_entity.rst b/docs/cerif_xml_person_entity.rst
@@ -152,6 +152,15 @@ AlternativeDAI
 :Format: regular expression ``info\:eu\-repo/dai/nl/\d{8}[\dxX]`` (as per `<https://wiki.surfnet.nl/display/standards/DAI>`_)
 
 
+Identifier
+^^^^^^^^^^
+:Description: A generic identifier, to be used only if your identifier does not fit in any of the above specific identifier types. This in particular applies to various national and service-specific identifiers that can be relevant in some interchange scenarios.
+:Use: optional, possibly multiple (0..*)
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
+:CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
+
+
+
 ElectronicAddress
 ^^^^^^^^^^^^^^^^^
 :Description: An electronic address associated with the person

diff --git a/docs/cerif_xml_project_entity.rst b/docs/cerif_xml_project_entity.rst
@@ -46,7 +46,7 @@ Identifier
 ^^^^^^^^^^
 :Description: An identifier of the project
 :Use: optional, possibly multiple (0..*)
-:Representation: XML element ``Identifier`` with mandatory ``type`` attribute
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
 
 

diff --git a/docs/cerif_xml_service_entity.rst b/docs/cerif_xml_service_entity.rst
@@ -52,7 +52,7 @@ Identifier
 ^^^^^^^^^^
 :Description: An identifier of this service
 :Use: optional, possibly multiple (0..*)
-:Representation: XML element ``Identifier`` with mandatory ``type`` attribute
+:Representation: XML element ``Identifier`` with a required ``type`` attribute (the URI of the identifier scheme)
 :CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
 
 

diff --git a/samples/openaire_cerif_xml_example_persons.xml b/samples/openaire_cerif_xml_example_persons.xml
@@ -290,5 +290,23 @@
             </metadata>
         </record>
 
+        <record>
+            <header>
+                <identifier>oai:cris.example.org:Persons/2000002</identifier>
+                <datestamp>2023-05-27T06:00:00Z</datestamp>
+                <setSpec>openaire_cris_persons</setSpec>
+            </header>
+            <metadata>
+                <Person xmlns="https://www.openaire.eu/cerif-profile/1.1/" id="Persons/2000002">
+                	<!-- a sample person to demonstrate the Peruvian DNI, following https://www.limaeasy.com/peru-guide/glossary-terms-peru/dni-peru-s-national-id-card -->
+                    <PersonName>
+                        <FamilyNames>Contreras Villavicencio</FamilyNames>
+                        <FirstNames>Ana Patricia</FirstNames>
+                    </PersonName>
+                    <Identifier type="https://www.wikidata.org/wiki/Q5797148">70025425-8</Identifier>
+                </Person>
+            </metadata>
+        </record>
+
 	</ListRecords>
 </OAI-PMH>
diff --git a/schemas/includes/orgunit-identifiers.xsd b/schemas/includes/orgunit-identifiers.xsd
@@ -86,7 +86,7 @@
  -->
 
 			<!-- the generic identifier -->
-			<xs:element name="Identifier" type="cfGenericIdentifier__Type" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="Identifier" type="cfGenericIdentifier__Type" minOccurs="0" maxOccurs="unbounded" cflink:identifier="true">
 				<xs:annotation>
 					<xs:documentation>A generic identifier, to be used only if your identifier does not fit in any of the above specific identifier types.</xs:documentation>
 				</xs:annotation>

diff --git a/schemas/includes/person-identifiers.xsd b/schemas/includes/person-identifiers.xsd
@@ -96,6 +96,14 @@
 			</xs:element>
  -->
 
+			<!-- the generic identifier -->
+			<xs:element name="Identifier" type="cfGenericIdentifier__Type" minOccurs="0" maxOccurs="unbounded" cflink:identifier="true">
+				<xs:annotation>
+					<xs:documentation>A generic identifier, to be used only if your identifier does not fit in any of the above specific identifier types.					
+					This in particular applies to various national and service-specific identifiers that can be relevant in some interchange scenarios.</xs:documentation>
+				</xs:annotation>
+			</xs:element>
+
 		</xs:sequence>
 	</xs:group>
 

diff --git a/schemas/scripts/xsd2cerif-rst.xsl b/schemas/scripts/xsd2cerif-rst.xsl
@@ -292,7 +292,7 @@ Internal Identifier
 		<xsl:call-template name="document-use"/>
 		<xsl:text>:Representation: XML element ``</xsl:text><xsl:value-of select="@name"/><xsl:text>``</xsl:text>
 		<xsl:if test="@type = 'cfGenericIdentifier__Type'">
-			<xsl:text> with mandatory ``type`` attribute</xsl:text>
+			<xsl:text> with a required ``type`` attribute (the URI of the identifier scheme)</xsl:text>
 		</xsl:if>
 		<xsl:text>
 </xsl:text>