Fix ORCID affiliation tags.

ADSCitationCapture/tests/data/datacite_decoded_orcid.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://datacite.org/schema/kernel-4" xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd">
+  <identifier identifierType="DOI">10.5281/ZENODO.10683242</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Dudouet, Jérémie</creatorName>
+      <givenName>Jérémie</givenName>
+      <familyName>Dudouet</familyName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="">0000-0002-9018-6763</nameIdentifier>
+      <affiliation>CNRS Délégation Rhône-Auvergne</affiliation>
+    </creator>
+  </creators>
+  <titles>
+    <title>Cubix</title>
+  </titles>
+  <publisher>Zenodo</publisher>
+  <publicationYear>2024</publicationYear>
+  <resourceType resourceTypeGeneral="Software"/>
+  <subjects>
+    <subject>GUI</subject>
+    <subject>gamma-ray spectroscopy</subject>
+    <subject>ROOT</subject>
+    <subject>fits</subject>
+  </subjects>
+  <dates>
+    <date dateType="Issued">2024-02-20</date>
+    <date dateType="Created">2023</date>
+    <date dateType="Available" dateInformation="First official release">2024</date>
+  </dates>
+  <language>en</language>
+  <alternateIdentifiers>
+    <alternateIdentifier alternateIdentifierType="oai">oai:zenodo.org:10683242</alternateIdentifier>
+  </alternateIdentifiers>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="DOI" relationType="Requires" resourceTypeGeneral="Software">10.5281/zenodo.10255692</relatedIdentifier>
+    <relatedIdentifier relatedIdentifierType="DOI" relationType="IsVersionOf">10.5281/zenodo.10683241</relatedIdentifier>
+  </relatedIdentifiers>
+  <sizes/>
+  <formats/>
+  <version>1.0</version>
+  <rightsList>
+    <rights rightsURI="http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html" rightsIdentifier="cecill-b" rightsIdentifierScheme="SPDX" schemeURI="https://spdx.org/licenses/">CeCILL-B Free Software License Agreement</rights>
+  </rightsList>
+  <descriptions>
+    <description descriptionType="Abstract">Cubix is a ROOT based graphical interface providing a large number of tools for gamma-ray spectrocopy analysis like peak fits, calibrations, gamma-gamma analysis... It is linked with the TkN library to provide a direct access to nuclear databases.
+
+The source code is available on Gitlab: https://gitlab.in2p3.fr/ip2igamma/cubix/cubix
+
+The documentation website : https://cubix.in2p3.fr
+
+
+
+The Cubix project is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software. You can use, modify and/or redistribute the software under the terms of the CeCILL-B license as circulated by CEA, CNRS and INRIA at the following link www.cecill.info.</description>
+  </descriptions>
+</resource>

ADSCitationCapture/tests/data/datacite_parsed_metadata_orcid.json

@@ -0,0 +1 @@
+{"bibcode": "", "authors": ["Dudouet, J\u00e9r\u00e9mie"], "normalized_authors": ["Dudouet, J"], "affiliations": ["CNRS D\u00e9l\u00e9gation Rh\u00f4ne-Auvergne <ID system=\"ORCID\">0000-0002-9018-6763</ID>"], "title": "Cubix", "pubdate": "2023", "properties": {"DOI": "10.5281/ZENODO.10683242"}, "keywords": ["GUI", "gamma-ray spectroscopy", "ROOT", "fits"], "abstract": "Cubix is a ROOT based graphical interface providing a large number of tools for gamma-ray spectrocopy analysis like peak fits, calibrations, gamma-gamma analysis... It is linked with the TkN library to provide a direct access to nuclear databases.\n\nThe source code is available on Gitlab: https://gitlab.in2p3.fr/ip2igamma/cubix/cubix\n\nThe documentation website : https://cubix.in2p3.fr\n\n\n\nThe Cubix project is governed by the CeCILL-B license under French law and abiding by the rules of distribution of free software. You can use, modify and/or redistribute the software under the terms of the CeCILL-B license as circulated by CEA, CNRS and INRIA at the following link www.cecill.info.", "references": [], "citations": [], "doctype": "software", "version": "1.0", "versions": [], "version_of": ["10.5281/zenodo.10683241"], "forked_from": [], "forks": [], "described_by": [], "description_of": [], "source": "Zenodo"}

ADSCitationCapture/tests/test_doi.py

@@ -62,6 +62,16 @@ def test_parse_metadata(self):
         parsed_metadata = doi.dc.parse(raw_metadata)
         self.assertEqual(parsed_metadata, expected_parsed_metadata)
 
+    def test_parse_metadata_orcid(self):
+        datacite_xml_format_filename = os.path.join(self.app.conf['PROJ_HOME'], "ADSCitationCapture/tests/data/datacite_decoded_orcid.xml")
+        with open(datacite_xml_format_filename, "r") as f:
+            raw_metadata = "".join(f.readlines())
+        datacite_parsed_metadata_filename = os.path.join(self.app.conf['PROJ_HOME'], "ADSCitationCapture/tests/data/datacite_parsed_metadata_orcid.json")
+        with open(datacite_parsed_metadata_filename, "r") as f:
+            expected_parsed_metadata = json.loads("".join(f.readlines()))
+        parsed_metadata = doi.dc.parse(raw_metadata)
+        self.assertEqual(parsed_metadata, expected_parsed_metadata)
+
     def test_build_bibcode(self):
         expected_bibcode = "2007zndo.....48535G"
         datacite_parsed_metadata_filename = os.path.join(self.app.conf['PROJ_HOME'], "ADSCitationCapture/tests/data/datacite_parsed_metadata_and_authors.json")

requirements.txt

@@ -1,4 +1,4 @@
-git+https://github.com/adsabs/adsabs-pyingest@v1.2.5
+git+https://github.com/adsabs/adsabs-pyingest@v1.2.6
 adsputils==1.4.3
 psycopg2-binary==2.8.3
 alembic==0.9.3
@@ -9,4 +9,4 @@ astropy==5.2.2
 portalocker==1.7.1
 SQLAlchemy-Utils==0.37.8
 unidecode==0.04.21
-setuptools<=56
+setuptools<=56