Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the identifiers (the rest of cases that were not caught before) #2

Open
wants to merge 33 commits into
base: issue-85
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e5240d7
orgunit identifiers added: ROR, GRID, FundRefRegistry
Nov 29, 2019
41cf208
Application of identifier naming convention
Jan 22, 2020
4eba5fc
Small type corrections
Feb 13, 2020
0d02074
change gender urls
Mar 3, 2020
c56a8b8
update funding originator urls
Mar 3, 2020
6da6975
update organisation funding role url
Mar 3, 2020
7a76abe
update language urls
Mar 3, 2020
9895098
update inter output relations urls
Mar 3, 2020
c7d2bed
correct InterFundingRelations url (undisplayed character)
Mar 3, 2020
c21c9c9
connect url for output-infrastructure relation url
Mar 3, 2020
90e1596
update vocabulary to use for OpenAccess uri fon funding
Mar 26, 2020
d0d6eb8
Fix the identifiers (some case were not caught before)
jdvorak001 Oct 22, 2020
108febf
Merge pull request #82 from lremy/urls-correction
jdvorak001 Nov 12, 2020
7dedc94
Update orgunit-identifiers.xsd
chenejac Nov 12, 2020
7f8d129
switch the order of imports (#60)
jdvorak001 Nov 12, 2020
900c5ff
add the gender vocabulary label and its terms
jdvorak001 Nov 12, 2020
68b0e5f
Corrections #73
jdvorak001 Nov 12, 2020
034b925
backport the ROARMAP link (#94)
jdvorak001 Nov 12, 2020
f0946f2
use InterOutputRelations#Reference for <References>
jdvorak001 Nov 13, 2020
9b354e9
#94 translates the effects of the backports on the documentation
jdvorak001 Nov 19, 2020
19e4014
Merge remote-tracking branch 'chenejac/master'
jdvorak001 Nov 19, 2020
8e8464a
#94 backport the regexp change into documentation
jdvorak001 Nov 19, 2020
df5b2a2
#76 support multiple xs:documentation/@source
jdvorak001 Nov 19, 2020
8775636
#76 plug in the specific orgunit identifer elements
jdvorak001 Nov 19, 2020
0089a89
#76 adapt the examples (FundRefID)
jdvorak001 Nov 19, 2020
5f41535
#94 backport #65
jdvorak001 Nov 19, 2020
c2e8395
#78 add the ./tools/compile.sh script and call it from .travis.yml
jdvorak001 Nov 19, 2020
1655004
#78 checkout also the necessary modules
jdvorak001 Nov 19, 2020
716eb6d
#78 introduce an error to be discovered by the validator
jdvorak001 Nov 20, 2020
45938f4
#78 corrects the error
jdvorak001 Nov 20, 2020
be7f44b
Make a total compile script (#96)
jdvorak001 Nov 20, 2020
257abaf
Merge branch 'issue-78-patch-1'
jdvorak001 Nov 20, 2020
38e8557
Merge branch 'master' into issue-85-patch-2
jdvorak001 Nov 20, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -10,5 +14,4 @@ jdk:
install: true

script:
# this runs two Maven goals: transform and validate
- travis_wait mvn test -B
- travis_wait ./tools/compile.sh
32 changes: 21 additions & 11 deletions conf/openaire-cerif-profile.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<CERIF-profile xmlns="https://w3id.org/cerif/profile" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cflink="https://w3id.org/cerif/annotations#" xsi:schemaLocation="https://w3id.org/cerif/profile ../../../git/CERIF-TG-Tools/src/main/resources/xsd/cerif-profile-definition.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
<CERIF-profile xmlns="https://w3id.org/cerif/profile" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cflink="https://w3id.org/cerif/annotations#" xsi:schemaLocation="https://w3id.org/cerif/profile ../../CERIF-TG-Tools/CERIF-Model-Tools/src/main/resources/xsd/cerif-profile-definition.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:sch="http://purl.oclc.org/dsdl/schematron">
<xs:annotation>
<xs:documentation>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).
Expand Down Expand Up @@ -33,17 +33,17 @@
<xs:documentation>OpenAIRE compatibility of the CRIS</xs:documentation>
</xs:annotation>
</Classification>
<xs:element name="WebsiteURL" type="cfString__Type" minOccurs="0" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/ElectronicAddressTypes#Website)">
<xs:element name="WebsiteURL" type="cfString__Type" minOccurs="0" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/ElectronicAddressTypes#Website)">
<xs:annotation>
<xs:documentation>URL of the website of the CRIS</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="OAIPMHBaseURL" type="cfString__Type" minOccurs="0" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/ElectronicAddressTypes#OAI-PMH_Base)">
<xs:element name="OAIPMHBaseURL" type="cfString__Type" minOccurs="0" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/ElectronicAddressTypes#OAI-PMH_Base)">
<xs:annotation>
<xs:documentation>Base URL for the OAI-PMH protocol endpoint of the CRIS</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SubjectHeadingsURL" type="cfString__Type" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/ElectronicAddressTypes#SubjectHeadings)">
<xs:element name="SubjectHeadingsURL" type="cfString__Type" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/IdentifierTypes#URL) https://w3id.org/cerif/model#FederatedIdentifier(https://w3id.org/cerif/vocab/ElectronicAddressTypes#SubjectHeadings)">
<xs:annotation>
<xs:documentation>The URL where the subject classification used by the CRIS can be obtained (using the HTTP GET)</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -71,6 +71,11 @@
</Entity>

<Entity uri="https://w3id.org/cerif/model#OrganisationUnit" leaveOut="Parts">
<IdentifiersFrom schemaLocation="includes/orgunit-identifiers.xsd">
<xs:annotation>
<xs:documentation>The orgunit identifiers.</xs:documentation>
</xs:annotation>
</IdentifiersFrom>
</Entity>

<Entity uri="https://w3id.org/cerif/model#ElectronicAddress">
Expand Down Expand Up @@ -124,7 +129,7 @@
<xs:documentation>The flag if Open Access is mandated for this funding</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="uri" type="xs:anyURI" use="optional" cflink:link="https://w3id.org/cerif/model#Funding_Classification(https://w3id.org/cerif/vocab/OpenAccessMandate)">
<xs:attribute name="uri" type="xs:anyURI" use="optional" cflink:link="https://w3id.org/cerif/model#Funding_Classification(http://roarmap.eprints.org/)">
<xs:annotation>
<xs:documentation>The Open Access policy that applies to this funding</xs:documentation>
</xs:annotation>
Expand Down Expand Up @@ -167,7 +172,7 @@
<xs:documentation>The event that is covered by this publication (e.g. a report about the event)</xs:documentation>
</xs:annotation>
</Link>
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPublication_ResultPublication(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPublication_ResultProduct(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPublication_ResultPatent(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPublication_ResultPublication(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPublication_ResultProduct(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPublication_ResultPatent(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<xs:annotation>
<xs:documentation>Result outputs that are referenced by this publication</xs:documentation>
</xs:annotation>
Expand All @@ -190,7 +195,7 @@
<xs:documentation>The product identifiers.</xs:documentation>
</xs:annotation>
</IdentifiersFrom>
<Link name="GeneratedBy" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultProduct_Equipment(https://w3id.org/cerif/vocab/InfrastructureOutputRelations#Generation)" target="Equipment">
<Link name="GeneratedBy" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultProduct_Equipment(https://w3id.org/cerif/vocab/OutputResearchInfrastructureRelations#Generation)" target="Equipment">
<xs:annotation>
<xs:documentation>The equipment that generated this product</xs:documentation>
</xs:annotation>
Expand All @@ -205,7 +210,7 @@
<xs:documentation>The event that is covered by this product (e.g. a video or audio interview about the event)</xs:documentation>
</xs:annotation>
</Link>
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPublication_ResultProduct(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultProduct_ResultProduct(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultProduct_ResultPatent(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPublication_ResultProduct(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultProduct_ResultProduct(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultProduct_ResultPatent(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<xs:annotation>
<xs:documentation>Result outputs that are referenced by this product</xs:documentation>
</xs:annotation>
Expand All @@ -217,18 +222,23 @@
</xs:element>
</Entity>

<Entity uri="https://w3id.org/cerif/model#ResultPatent" leaveOut="ReferencedBy Parts Identifier">
<Entity uri="https://w3id.org/cerif/model#ResultPatent" leaveOut="ReferencedBy Parts">
<Classification kind="Type" schema="vocabularies/coar_patent_types.xsd" minOccurs="1" maxOccurs="1">
<xs:annotation>
<xs:documentation>The type of the patent (currently just one option)</xs:documentation>
</xs:annotation>
</Classification>
<Link name="Predecessor" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPatent_ResultPatent(https://w3id.org/cerif/vocab/Inter-OutputRelations#Predecessor):1" target="Patent">
<IdentifiersFrom schemaLocation="includes/patent-identifiers.xsd">
<xs:annotation>
<xs:documentation>The patent identifiers.</xs:documentation>
</xs:annotation>
</IdentifiersFrom>
<Link name="Predecessor" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPatent_ResultPatent(https://w3id.org/cerif/vocab/InterPatentRelations#Predecessor):1" target="Patent">
<xs:annotation>
<xs:documentation>Patents that precede (i.e., have priority over) this patent</xs:documentation>
</xs:annotation>
</Link>
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPatent_ResultPublication(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPatent_ResultProduct(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPatent_ResultPatent(https://w3id.org/cerif/vocab/Inter-OutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<Link name="References" minOccurs="0" maxOccurs="unbounded" cflink:link="https://w3id.org/cerif/model#ResultPublication_ResultPatent(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultProduct_ResultPatent(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1 https://w3id.org/cerif/model#ResultPatent_ResultPatent(https://w3id.org/cerif/vocab/InterOutputRelations#Reference):1" target="ResearchOutput__SubstitutionGroupHead">
<xs:annotation>
<xs:documentation>Result outputs that are referenced by this patent</xs:documentation>
</xs:annotation>
Expand Down
4 changes: 2 additions & 2 deletions docs/cerif_xml_funding_entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ 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 (`<https://w3id.org/cerif/model#OrganisationUnit_Funding>`_) with the `<https://w3id.org/cerif/vocab/OrganisationFundingEngagements#Funder>`_ semantics
:CERIF: the OrganisationUnit_Funding linking entity (`<https://w3id.org/cerif/model#OrganisationUnit_Funding>`_) with the `<https://w3id.org/cerif/vocab/OrganisationFundingRoles#Financier>`_ semantics


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 (`<https://w3id.org/cerif/model#Funding_Funding>`_) with the `<https://w3id.org/cerif/vocab/Inter­FundingRelations#Part>`_ semantics (direction :1)
:CERIF: the Funding_Funding linking entity (`<https://w3id.org/cerif/model#Funding_Funding>`_) with the `<https://w3id.org/cerif/vocab/InterFundingRelations#Part>`_ semantics (direction :1)


Duration
Expand Down
85 changes: 82 additions & 3 deletions docs/cerif_xml_organisation_entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``https:\/\/ror\.org\/0[\da-hj-km-np-tv-zA-HJ-KM-NP-TV-Z]{6}\d{2}`` (as per `<https://ror.org/facts/>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``https:\/\/ror\.org\/0[\da-hj-km-np-tv-zA-HJ-KM-NP-TV-Z]{6}\d{2}`` (as per `<https://ror.org/facts/>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``grid\.\d{4,}\.[0-9a-f]{1,2}`` (as per `<https://www.wikidata.org/wiki/Property_talk:P2427>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``grid\.\d{4,}\.[0-9a-f]{1,2}`` (as per `<https://www.wikidata.org/wiki/Property_talk:P2427>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``https:\/\/doi.org\/10\.13039\/\d+`` (as per `<https://www.crossref.org/display-guidelines/>`_ `<https://www.wikidata.org/wiki/Q19822542>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``https:\/\/doi.org\/10\.13039\/\d+`` (as per `<https://www.crossref.org/display-guidelines/>`_ `<https://www.wikidata.org/wiki/Q19822542>`_)



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 (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Representation: XML element ``Identifier``



Expand Down
4 changes: 2 additions & 2 deletions docs/cerif_xml_patent_entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ OriginatesFrom
^^^^^^^^^^^^^^
:Use: optional, possibly multiple (0..*)
:Representation: XML element ``OriginatesFrom`` with embedded XML element ``Project`` or ``Funding``
:CERIF: the Project_ResultPatent linking entity (`<https://w3id.org/cerif/model#Project_ResultPatent>`_) with the `<https://w3id.org/cerif/vocab/ProjectOutputRoles#Originator>`_ semantics; the ResultPatent_Funding linking entity (`<https://w3id.org/cerif/model#ResultPatent_Funding>`_) with the `<https://w3id.org/cerif/vocab/Funding_Output_Roles#Originator>`_ semantics
:CERIF: the Project_ResultPatent linking entity (`<https://w3id.org/cerif/model#Project_ResultPatent>`_) with the `<https://w3id.org/cerif/vocab/ProjectOutputRoles#Originator>`_ semantics; the ResultPatent_Funding linking entity (`<https://w3id.org/cerif/model#ResultPatent_Funding>`_) with the `<https://w3id.org/cerif/vocab/OutputFundingRoles#Originator>`_ semantics


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 (`<https://w3id.org/cerif/model#ResultPatent_ResultPatent>`_) with the `<https://w3id.org/cerif/vocab/InterOutputRelations#Predecessor>`_ semantics (direction :1)
:CERIF: the ResultPatent_ResultPatent linking entity (`<https://w3id.org/cerif/model#ResultPatent_ResultPatent>`_) with the `<https://w3id.org/cerif/vocab/InterPatentRelations#Predecessor>`_ semantics (direction :1)


References
Expand Down
8 changes: 4 additions & 4 deletions docs/cerif_xml_person_entity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ Gender
:CERIF: the Person.Gender attribute (`<https://w3id.org/cerif/model#Person.Gender>`_)
:Vocabulary: Genders (sociocultural, not linguistic)

* **Masculine** (``m``): Man
* **Feminine** (``f``): Woman
* **Masculine** (``m``):
* **Feminine** (``f``):



Expand Down Expand Up @@ -128,7 +128,7 @@ ISNI
:Use: optional (0..1)
:Representation: XML element ``ISNI``
:CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``[0-9]{4} [0-9]{4} [0-9]{4} [0-9]{3}[0-9X]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)
:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)



Expand All @@ -138,7 +138,7 @@ AlternativeISNI
:Use: optional, possibly multiple (0..*)
:Representation: XML element ``AlternativeISNI``
:CERIF: the FederatedIdentifier entity (`<https://w3id.org/cerif/model#FederatedIdentifier>`_)
:Format: regular expression ``[0-9]{4} [0-9]{4} [0-9]{4} [0-9]{3}[0-9X]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)
:Format: regular expression ``\d{4} \d{4} \d{4} \d{3}[\dX]`` (as per `<https://www.wikidata.org/wiki/Property:P213>`_)



Expand Down
Loading