/ - Diff - D-Net - D-Net project tracking tool

« Previous | Next »

Revision 58494

Added by Argiro Kokogiannaki about 4 years ago

Fix1: set type after parsing response from external sources - this fix puts the record in the proper file path

Fix2: Update orcid parser, use single orcid work response
update ExternalParserTest

+        }
         private String orcidXml2 = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                 "<activities:works path=\"/0000-0002-3477-3082/works\" xmlns:internal=\"http://www.orcid.org/ns/internal\" xmlns:funding=\"http://www.orcid.org/ns/funding\" xmlns:preferences=\"http://www.orcid.org/ns/preferences\" xmlns:address=\"http://www.orcid.org/ns/address\" xmlns:education=\"http://www.orcid.org/ns/education\" xmlns:work=\"http://www.orcid.org/ns/work\" xmlns:deprecated=\"http://www.orcid.org/ns/deprecated\" xmlns:other-name=\"http://www.orcid.org/ns/other-name\" xmlns:history=\"http://www.orcid.org/ns/history\" xmlns:employment=\"http://www.orcid.org/ns/employment\" xmlns:error=\"http://www.orcid.org/ns/error\" xmlns:common=\"http://www.orcid.org/ns/common\" xmlns:person=\"http://www.orcid.org/ns/person\" xmlns:activities=\"http://www.orcid.org/ns/activities\" xmlns:record=\"http://www.orcid.org/ns/record\" xmlns:researcher-url=\"http://www.orcid.org/ns/researcher-url\" xmlns:peer-review=\"http://www.orcid.org/ns/peer-review\" xmlns:personal-details=\"http://www.orcid.org/ns/personal-details\" xmlns:bulk=\"http://www.orcid.org/ns/bulk\" xmlns:keyword=\"http://www.orcid.org/ns/keyword\" xmlns:email=\"http://www.orcid.org/ns/email\" xmlns:external-identifier=\"http://www.orcid.org/ns/external-identifier\">\n" +
                 "<common:last-modified-date>2015-07-16T22:57:28.480Z</common:last-modified-date>\n" +
                 "<activities:group>\n" +
                 "<common:last-modified-date>2015-07-16T22:57:28.344Z</common:last-modified-date>\n" +
                 "<common:external-ids>\n" +
                 "<common:external-id>\n" +
                 "<common:external-id-type>doi</common:external-id-type>\n" +
                 "<common:external-id-value>10.1007/978-3-642-27169-4_2</common:external-id-value>\n" +
                 "<common:external-id-url/>\n" +
                 "<common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "</common:external-id>\n" +
                 "</common:external-ids>\n" +
                 "<work:work-summary put-code=\"5288651\" path=\"/0000-0002-3477-3082/work/5288651\" visibility=\"public\" display-index=\"0\">\n" +
                 "<common:created-date>2013-03-08T03:19:36.095Z</common:created-date>\n" +
                 "<common:last-modified-date>2015-07-16T22:57:28.264Z</common:last-modified-date>\n" +
                 "<common:source>\n" +
                 "<common:source-orcid>\n" +
                 "<common:uri>https://orcid.org/0000-0002-3477-3082</common:uri>\n" +
                 "<common:path>0000-0002-3477-3082</common:path>\n" +
                 "<common:host>orcid.org</common:host>\n" +
                 "</common:source-orcid>\n" +
                 "<common:source-name>Natalia Manola</common:source-name>\n" +
                 "</common:source>\n" +
                 "<work:title>\n" +
                 "<common:title>\n" +
                 "A Survey of Context-Aware Cross-Digital Library Personalization\n" +
                 "</common:title>\n" +
                 "</work:title>\n" +
                 "<common:external-ids>\n" +
                 "<common:external-id>\n" +
                 "<common:external-id-type>doi</common:external-id-type>\n" +
                 "<common:external-id-value>10.1007/978-3-642-27169-4_2</common:external-id-value>\n" +
                 "<common:external-id-url/>\n" +
                 "<common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "</common:external-id>\n" +
                 "</common:external-ids>\n" +
                 "<work:type>book-chapter</work:type>\n" +
                 "<common:publication-date>\n" +
                 "<common:year>2012</common:year>\n" +
                 "</common:publication-date>\n" +
                 "</work:work-summary>\n" +
                 "<work:work-summary put-code=\"5288654\" path=\"/0000-0002-3477-3082/work/5288654\" visibility=\"public\" display-index=\"0\">\n" +
                 "<common:created-date>2013-03-08T03:19:36.116Z</common:created-date>\n" +
                 "<common:last-modified-date>2015-07-16T22:57:28.344Z</common:last-modified-date>\n" +
                 "<common:source>\n" +
                 "<common:source-client-id>\n" +
                 "<common:uri>https://orcid.org/client/0000-0002-5982-8983</common:uri>\n" +
                 "<common:path>0000-0002-5982-8983</common:path>\n" +
                 "<common:host>orcid.org</common:host>\n" +
                 "</common:source-client-id>\n" +
                 "<common:source-name>Scopus - Elsevier</common:source-name>\n" +
                 "</common:source>\n" +
                 "<work:title>\n" +
                 "<common:title>\n" +
                 "A survey of context-aware cross-digital library personalization\n" +
                 "</common:title>\n" +
                 "</work:title>\n" +
                 "<common:external-ids>\n" +
                 "<common:external-id>\n" +
                 "<common:external-id-type>doi</common:external-id-type>\n" +
                 "<common:external-id-value>10.1007/978-3-642-27169-4_2</common:external-id-value>\n" +
                 "<common:external-id-url/>\n" +
                 "<common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "</common:external-id>\n" +
                 "</common:external-ids>\n" +
                 "<work:type>journal-article</work:type>\n" +
                 "<common:publication-date>\n" +
                 "<common:year>2011</common:year>\n" +
                 "</common:publication-date>\n" +
                 "</work:work-summary>\n" +
                 "</activities:group>\n" +
                 "</activities:works>";
                 "<work:work put-code=\"43079714\" path=\"/0000-0001-5264-4324/work/43079714\" visibility=\"public\" xmlns:internal=\"http://www.orcid.org/ns/internal\" xmlns:funding=\"http://www.orcid.org/ns/funding\" xmlns:preferences=\"http://www.orcid.org/ns/preferences\" xmlns:address=\"http://www.orcid.org/ns/address\" xmlns:education=\"http://www.orcid.org/ns/education\" xmlns:work=\"http://www.orcid.org/ns/work\" xmlns:deprecated=\"http://www.orcid.org/ns/deprecated\" xmlns:other-name=\"http://www.orcid.org/ns/other-name\" xmlns:history=\"http://www.orcid.org/ns/history\" xmlns:employment=\"http://www.orcid.org/ns/employment\" xmlns:error=\"http://www.orcid.org/ns/error\" xmlns:common=\"http://www.orcid.org/ns/common\" xmlns:person=\"http://www.orcid.org/ns/person\" xmlns:activities=\"http://www.orcid.org/ns/activities\" xmlns:record=\"http://www.orcid.org/ns/record\" xmlns:researcher-url=\"http://www.orcid.org/ns/researcher-url\" xmlns:peer-review=\"http://www.orcid.org/ns/peer-review\" xmlns:personal-details=\"http://www.orcid.org/ns/personal-details\" xmlns:bulk=\"http://www.orcid.org/ns/bulk\" xmlns:keyword=\"http://www.orcid.org/ns/keyword\" xmlns:email=\"http://www.orcid.org/ns/email\" xmlns:external-identifier=\"http://www.orcid.org/ns/external-identifier\">\n" +
                 "    <common:created-date>2018-03-29T08:12:17.179Z</common:created-date>\n" +
                 "    <common:last-modified-date>2018-03-29T08:12:17.179Z</common:last-modified-date>\n" +
                 "    <common:source>\n" +
                 "        <common:source-orcid>\n" +
                 "            <common:uri>https://orcid.org/0000-0001-5264-4324</common:uri>\n" +
                 "            <common:path>0000-0001-5264-4324</common:path>\n" +
                 "            <common:host>orcid.org</common:host>\n" +
                 "        </common:source-orcid>\n" +
                 "        <common:source-name>Bastien Mérigot</common:source-name>\n" +
                 "    </common:source>\n" +
                 "    <work:title>\n" +
                 "        <common:title>A three-dimensional view on biodiversity changes: spatial, temporal, and functional perspectives on fish communities in the Baltic Sea</common:title>\n" +
                 "    </work:title>\n" +
                 "    <work:journal-title>ICES Journal of Marine Science</work:journal-title>\n" +
                 "    <work:citation>\n" +
                 "        <work:citation-type>bibtex</work:citation-type>\n" +
                 "        <work:citation-value>@article{doi:10.1093/icesjms/fsy027, author= {Frelat, Romain and Orio, Alessandro and Casini, Michele and Lehmann, Andreas and Mérigot, Bastien and Otto, Saskia A and Sguotti, Camilla and Möllmann, Christian and Handling editor: Marta Coll}, title= {A three-dimensional view on biodiversity changes: spatial, temporal, and functional perspectives on fish communities in the Baltic Sea}, journal= {ICES Journal of Marine Science}, volume= {}, number= {}, pages= {fsy027}, year= {2018}, doi= {10.1093/icesjms/fsy027}, URL= {http://dx.doi.org/10.1093/icesjms/fsy027}, eprint= {/oup/backfile/content_public/journal/icesjms/pap/10.1093_icesjms_fsy027/1/fsy027.pdf}}\n" +
                 "\n" +
                 "</work:citation-value>\n" +
                 "    </work:citation>\n" +
                 "    <work:type>journal-article</work:type>\n" +
                 "    <common:publication-date>\n" +
                 "        <common:year>2018</common:year>\n" +
                 "    </common:publication-date>\n" +
                 "    <common:external-ids>\n" +
                 "        <common:external-id>\n" +
                 "            <common:external-id-type>doi</common:external-id-type>\n" +
                 "            <common:external-id-value>10.1093/icesjms/fsy027</common:external-id-value>\n" +
                 "            <common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "        </common:external-id>\n" +
                 "        <common:external-id>\n" +
                 "            <common:external-id-type>arxiv</common:external-id-type>\n" +
                 "            <common:external-id-value>/oup/backfile/content_public/journal/icesjms/pap/10.1093_icesjms_fsy027/1/fsy027.pdf</common:external-id-value>\n" +
                 "            <common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "        </common:external-id>\n" +
                 "    </common:external-ids>\n" +
                 "    <work:url>http://dx.doi.org/10.1093/icesjms/fsy027</work:url>\n" +
                 "    <work:contributors/>\n" +
                 "</work:work>";
         private String orcidXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                 "<activities:works path=\"/0000-0002-9414-646X/works\" xmlns:internal=\"http://www.orcid.org/ns/internal\" xmlns:funding=\"http://www.orcid.org/ns/funding\" xmlns:preferences=\"http://www.orcid.org/ns/preferences\" xmlns:address=\"http://www.orcid.org/ns/address\" xmlns:education=\"http://www.orcid.org/ns/education\" xmlns:work=\"http://www.orcid.org/ns/work\" xmlns:deprecated=\"http://www.orcid.org/ns/deprecated\" xmlns:other-name=\"http://www.orcid.org/ns/other-name\" xmlns:history=\"http://www.orcid.org/ns/history\" xmlns:employment=\"http://www.orcid.org/ns/employment\" xmlns:error=\"http://www.orcid.org/ns/error\" xmlns:common=\"http://www.orcid.org/ns/common\" xmlns:person=\"http://www.orcid.org/ns/person\" xmlns:activities=\"http://www.orcid.org/ns/activities\" xmlns:record=\"http://www.orcid.org/ns/record\" xmlns:researcher-url=\"http://www.orcid.org/ns/researcher-url\" xmlns:peer-review=\"http://www.orcid.org/ns/peer-review\" xmlns:personal-details=\"http://www.orcid.org/ns/personal-details\" xmlns:bulk=\"http://www.orcid.org/ns/bulk\" xmlns:keyword=\"http://www.orcid.org/ns/keyword\" xmlns:email=\"http://www.orcid.org/ns/email\" xmlns:external-identifier=\"http://www.orcid.org/ns/external-identifier\">\n" +
                 "    <common:last-modified-date>2017-11-07T11:56:05.454Z</common:last-modified-date>\n" +
                 "    <activities:group>\n" +
                 "        <common:last-modified-date>2016-01-22T14:32:26.233Z</common:last-modified-date>\n" +
                 "        <common:external-ids>\n" +
                 "            <common:external-id>\n" +
                 "                <common:external-id-type>doi</common:external-id-type>\n" +
                 "                <common:external-id-value>10.1109/smc.2015.229</common:external-id-value>\n" +
                 "                <common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "            </common:external-id>\n" +
                 "        </common:external-ids>\n" +
                 "        <work:work-summary put-code=\"21755327\" path=\"/0000-0002-9414-646X/work/21755327\" visibility=\"public\" display-index=\"0\">\n" +
                 "            <common:created-date>2016-01-22T14:30:35.071Z</common:created-date>\n" +
                 "            <common:last-modified-date>2016-01-22T14:32:26.233Z</common:last-modified-date>\n" +
                 "            <common:source>\n" +
                 "                <common:source-client-id>\n" +
                 "                    <common:uri>https://orcid.org/client/0000-0002-3054-1567</common:uri>\n" +
                 "                    <common:path>0000-0002-3054-1567</common:path>\n" +
                 "                    <common:host>orcid.org</common:host>\n" +
                 "                </common:source-client-id>\n" +
                 "                <common:source-name>CrossRef Metadata Search</common:source-name>\n" +
                 "            </common:source>\n" +
                 "            <work:title>\n" +
                 "                <common:title>Providing Ubiquitous Positioning in Outdoor Environments</common:title>\n" +
                 "            </work:title>\n" +
                 "            <common:external-ids>\n" +
                 "                <common:external-id>\n" +
                 "                    <common:external-id-type>doi</common:external-id-type>\n" +
                 "                    <common:external-id-value>10.1109/smc.2015.229</common:external-id-value>\n" +
                 "                    <common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "                </common:external-id>\n" +
                 "            </common:external-ids>\n" +
                 "            <work:type>conference-paper</work:type>\n" +
                 "            <common:publication-date>\n" +
                 "                <common:year>2015</common:year>\n" +
                 "                <common:month>10</common:month>\n" +
                 "            </common:publication-date>\n" +
                 "        </work:work-summary>\n" +
                 "    </activities:group>\n" +
                 "<activities:group><common:last-modified-date>2018-04-18T14:40:54.953Z</common:last-modified-date><common:external-ids><common:external-id><common:external-id-type>arxiv</common:external-id-type><common:external-id-value>/oup/backfile/content_public/journal/icesjms/pap/10.1093_icesjms_fsy027/1/fsy027.pdf</common:external-id-value><common:external-id-relationship>self</common:external-id-relationship></common:external-id><common:external-id><common:external-id-type>doi</common:external-id-type><common:external-id-value>10.1093/icesjms/fsy027</common:external-id-value><common:external-id-relationship>self</common:external-id-relationship></common:external-id></common:external-ids>" +
                 "<work:work-summary put-code=\"43079714\" path=\"/0000-0001-5264-4324/work/43079714\" visibility=\"public\" display-index=\"1\"><common:created-date>2018-03-29T08:12:17.179Z</common:created-date><common:last-modified-date>2018-03-29T08:12:17.179Z</common:last-modified-date><common:source><common:source-orcid><common:uri>https://orcid.org/0000-0001-5264-4324</common:uri><common:path>0000-0001-5264-4324</common:path><common:host>orcid.org</common:host></common:source-orcid><common:source-name>Bastien Mérigot</common:source-name></common:source>" +
                 "<work:title><common:title>A three-dimensional view on biodiversity changes: spatial, temporal, and functional perspectives on fish communities in the Baltic Sea</common:title></work:title>" +
                 "<common:external-ids><common:external-id><common:external-id-type>doi</common:external-id-type><common:external-id-value>10.1093/icesjms/fsy027</common:external-id-value><common:external-id-relationship>self</common:external-id-relationship></common:external-id><common:external-id><common:external-id-type>arxiv</common:external-id-type><common:external-id-value>/oup/backfile/content_public/journal/icesjms/pap/10.1093_icesjms_fsy027/1/fsy027.pdf</common:external-id-value><common:external-id-relationship>self</common:external-id-relationship></common:external-id></common:external-ids><work:type>journal-article</work:type><common:publication-date><common:year>2018</common:year></common:publication-date></work:work-summary><work:work-summary put-code=\"43766400\" path=\"/0000-0001-5264-4324/work/43766400\" visibility=\"public\" display-index=\"0\"><common:created-date>2018-04-18T14:40:54.953Z</common:created-date><common:last-modified-date>2018-04-18T14:40:54.953Z</common:last-modified-date><common:source><common:source-client-id><common:uri>https://orcid.org/client/0000-0003-1377-5676</common:uri><common:path>0000-0003-1377-5676</common:path><common:host>orcid.org</common:host></common:source-client-id><common:source-name>ResearcherID</common:source-name></common:source><work:title><common:title>A three-dimensional view on biodiversity changes: spatial, temporal, and functional perspectives on fish communities in the Baltic Sea</common:title></work:title><common:external-ids><common:external-id><common:external-id-type>doi</common:external-id-type><common:external-id-value>10.1093/icesjms/fsy027</common:external-id-value><common:external-id-relationship>self</common:external-id-relationship></common:external-id></common:external-ids><work:type>journal-article</work:type><common:publication-date><common:year>2018</common:year></common:publication-date></work:work-summary></activities:group>"+
                 "</activities:works>\n";
         private String orcidXml ="<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                 "<work:work put-code=\"21755327\" path=\"/0000-0002-9414-646X/work/21755327\" visibility=\"public\" xmlns:internal=\"http://www.orcid.org/ns/internal\" xmlns:funding=\"http://www.orcid.org/ns/funding\" xmlns:preferences=\"http://www.orcid.org/ns/preferences\" xmlns:address=\"http://www.orcid.org/ns/address\" xmlns:education=\"http://www.orcid.org/ns/education\" xmlns:work=\"http://www.orcid.org/ns/work\" xmlns:deprecated=\"http://www.orcid.org/ns/deprecated\" xmlns:other-name=\"http://www.orcid.org/ns/other-name\" xmlns:history=\"http://www.orcid.org/ns/history\" xmlns:employment=\"http://www.orcid.org/ns/employment\" xmlns:error=\"http://www.orcid.org/ns/error\" xmlns:common=\"http://www.orcid.org/ns/common\" xmlns:person=\"http://www.orcid.org/ns/person\" xmlns:activities=\"http://www.orcid.org/ns/activities\" xmlns:record=\"http://www.orcid.org/ns/record\" xmlns:researcher-url=\"http://www.orcid.org/ns/researcher-url\" xmlns:peer-review=\"http://www.orcid.org/ns/peer-review\" xmlns:personal-details=\"http://www.orcid.org/ns/personal-details\" xmlns:bulk=\"http://www.orcid.org/ns/bulk\" xmlns:keyword=\"http://www.orcid.org/ns/keyword\" xmlns:email=\"http://www.orcid.org/ns/email\" xmlns:external-identifier=\"http://www.orcid.org/ns/external-identifier\">\n" +
                 "    <common:created-date>2016-01-22T14:30:35.071Z</common:created-date>\n" +
                 "    <common:last-modified-date>2016-01-22T14:32:26.233Z</common:last-modified-date>\n" +
                 "    <common:source>\n" +
                 "        <common:source-client-id>\n" +
                 "            <common:uri>https://orcid.org/client/0000-0002-3054-1567</common:uri>\n" +
                 "            <common:path>0000-0002-3054-1567</common:path>\n" +
                 "            <common:host>orcid.org</common:host>\n" +
                 "        </common:source-client-id>\n" +
                 "        <common:source-name>Crossref Metadata Search</common:source-name>\n" +
                 "    </common:source>\n" +
                 "    <work:title>\n" +
                 "        <common:title>Providing Ubiquitous Positioning in Outdoor Environments</common:title>\n" +
                 "    </work:title>\n" +
                 "    <work:journal-title>2015 IEEE International Conference on Systems, Man, and Cybernetics</work:journal-title>\n" +
                 "    <work:citation>\n" +
                 "        <work:citation-type>bibtex</work:citation-type>\n" +
                 "        <work:citation-value>@inproceedings{Moreno_2015,doi = {10.1109/smc.2015.229},url = {http://dx.doi.org/10.1109/smc.2015.229},year = 2015,month = {oct},publisher = {Institute of Electrical {\\&amp;} Electronics Engineers ({IEEE})},author = {Daniel Moreno and Sergio F. Ochoa and Roc Meseguer},title = {Providing Ubiquitous Positioning in Outdoor Environments},booktitle = {2015 {IEEE} International Conference on Systems, Man, and Cybernetics}}</work:citation-value>\n" +
                 "    </work:citation>\n" +
                 "    <work:type>conference-paper</work:type>\n" +
                 "    <common:publication-date>\n" +
                 "        <common:year>2015</common:year>\n" +
                 "        <common:month>10</common:month>\n" +
                 "    </common:publication-date>\n" +
                 "    <common:external-ids>\n" +
                 "        <common:external-id>\n" +
                 "            <common:external-id-type>doi</common:external-id-type>\n" +
                 "            <common:external-id-value>10.1109/smc.2015.229</common:external-id-value>\n" +
                 "            <common:external-id-relationship>self</common:external-id-relationship>\n" +
                 "        </common:external-id>\n" +
                 "    </common:external-ids>\n" +
                 "    <work:contributors>\n" +
                 "        <work:contributor>\n" +
                 "            <work:credit-name>Daniel Moreno</work:credit-name>\n" +
                 "            <work:contributor-attributes>\n" +
                 "                <work:contributor-role>author</work:contributor-role>\n" +
                 "            </work:contributor-attributes>\n" +
                 "        </work:contributor>\n" +
                 "        <work:contributor>\n" +
                 "            <work:credit-name>Sergio F. Ochoa</work:credit-name>\n" +
                 "            <work:contributor-attributes>\n" +
                 "                <work:contributor-role>author</work:contributor-role>\n" +
                 "            </work:contributor-attributes>\n" +
                 "        </work:contributor>\n" +
                 "        <work:contributor>\n" +
                 "            <work:credit-name>Roc Meseguer</work:credit-name>\n" +
                 "            <work:contributor-attributes>\n" +
                 "                <work:contributor-role>author</work:contributor-role>\n" +
                 "            </work:contributor-attributes>\n" +
                 "        </work:contributor>\n" +
                 "    </work:contributors>\n" +
                 "</work:work>";
         @Test
         public void orcid2ResultTest() {
             Result result = ExternalRecordParser.orcid2Result(orcidXml, "0000-0002-9414-646X-21755327");
             System.out.println(result);
             System.out.println(result.getTitle() + result.getAccessRights());
             Assert.assertNull(result.getAccessRights());
             Assert.assertNull(result.getBestLicense());
-...
         @Test
         public void orcidSecond2ResultTest() throws Exception {
             String id =  "0000-0002-3477-3082-5288650";
             Result result = ExternalRecordParser.orcid2Result(searchUtils.fetchResultXMLFromOrcid(id.substring(0, 19)),id);
             Result result = ExternalRecordParser.orcid2Result(searchUtils.fetchResultXMLFromOrcid(id),id);
             System.out.println(result);
              id =  "0000-0002-3477-3082-5288651";
              result = ExternalRecordParser.orcid2Result(searchUtils.fetchResultXMLFromOrcid(id.substring(0, 19)),id);
              result = ExternalRecordParser.orcid2Result(searchUtils.fetchResultXMLFromOrcid(id),id);
             System.out.println(result);
     //        System.out.println(result.getTitle() + result.getAccessRights());
             Assert.assertNull(result.getAccessRights());
-...
+        }
         @Test
         public void orcid2Result2Test() {
             Result result = ExternalRecordParser.orcid2Result(orcidXml, "0000-0001-5264-4324-43079714");
             Result result = ExternalRecordParser.orcid2Result(orcidXml2, "0000-0001-5264-4324-43079714");
             System.out.println(result);
             Assert.assertNull(result.getAccessRights());
             Assert.assertNull(result.getBestLicense());

modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claims/utils/SearchUtils.java
94	94	}
95	95	public String fetchResultXMLFromOrcid(String id) throws Exception{
96	96
97		return getRequest(getOrcidUrl(id));
	97	return getRequest(getOrcidUrl(id.substring(0, 19), id.substring( 20)));
98	98	}
99	99	public String fetchContext(String suffix) throws Exception{
100	100
...	...
127	127	return dataciteUrl+id;
128	128	}
129	129
130		private static String getOrcidUrl(String id) {
	130	private static String getOrcidUrl(String id, String putcode) {
131	131
132		return orcidUrlPrefix+id+orcidUrlSuffix;
	132	return orcidUrlPrefix+id+orcidUrlSuffix+putcode;
133	133	}
134	134	private static String getContextsAPIUrl() {
135	135

                 return result;
+            }
             String orcidwork = orcidworkid.substring(20, orcidworkid.length());
             System.out.println();
             try {
                 DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
                 DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-...
                 NodeList nl;
                 System.out.println(orcidwork);
                 NodeList worknl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']").evaluate(document,XPathConstants.NODESET);
                 NodeList worknl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']").evaluate(document,XPathConstants.NODESET);
                 for( int n = 0; n<worknl.getLength(); n++){
                     String code = (String) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']/@put-code").evaluate(worknl.item(n), XPathConstants.STRING);
                     String code = (String) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']/@put-code").evaluate(worknl.item(n), XPathConstants.STRING);
                     result = new Result();
                     result.setResultType(ClaimUtils.PUBLICATION);
                     nl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']/*[name()='work:title']/*[name()='common:title']/text()").evaluate(worknl.item(n), XPathConstants.NODESET);
                     nl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']/*[name()='work:title']/*[name()='common:title']/text()").evaluate(worknl.item(n), XPathConstants.NODESET);
                     if (nl.getLength() > 0) {
                         result.setTitle(nl.item(0).getNodeValue());
+                    }
                     nl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']//*[name()='common:external-id']").evaluate(worknl.item(n), XPathConstants.NODESET);
                     nl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']//*[name()='common:external-id']").evaluate(worknl.item(n), XPathConstants.NODESET);
                     for (int i = 0; i < nl.getLength(); i++) {
                         NodeList identifiersNl;
                         String type=null;
                         String id=null;
                         identifiersNl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']//*[name()='common:external-id-type']/text()").evaluate(nl.item(i), XPathConstants.NODESET);
                         identifiersNl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']//*[name()='common:external-id-type']/text()").evaluate(nl.item(i), XPathConstants.NODESET);
                         if (identifiersNl.getLength() > 0) {
                             type=identifiersNl.item(0).getNodeValue();
+                        }
                         identifiersNl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']//*[name()='common:external-id-value']/text()").evaluate(nl.item(i), XPathConstants.NODESET);
                         identifiersNl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']//*[name()='common:external-id-value']/text()").evaluate(nl.item(i), XPathConstants.NODESET);
                         if (identifiersNl.getLength() > 0) {
                             id=identifiersNl.item(0).getNodeValue();
+                        }
-...
+                    }
                     if(result.getExternalUrl()==null) {
                         nl = (NodeList) xpath.compile("//*[name()='work:work-summary'][@put-code='"+orcidwork+"']//*[name()='common:source']/*[name()='common:source-client-id']/*[name()='common:uri']/text()").evaluate(document, XPathConstants.NODESET);
                         nl = (NodeList) xpath.compile("//*[name()='work:work'][@put-code='"+orcidwork+"']//*[name()='common:source']/*[name()='common:source-client-id']/*[name()='common:uri']/text()").evaluate(document, XPathConstants.NODESET);
                         if (nl.getLength() > 0) {
                             result.setExternalUrl(nl.item(0).getNodeValue());
+                        }
-...
             return result;
+        }
         /**
+         *
          * @param xml

modules/uoa-claims/trunk/src/main/java/eu/dnetlib/data/claims/handler/ExternalRecordHandler.java
37	37	}
38	38
39	39	public Result fetchResultfromOrcid(String id) throws Exception {
40		Result result = externalRecordParser.orcid2Result(fetchOrcidRecord(id.substring(0, 19)), id);
	40	Result result = externalRecordParser.orcid2Result(fetchOrcidRecord(id), id);
41	41
42	42	return result;
43	43	}

                     result.setAccessRights(accessRights);
                     result.setEmbargoEndDate(embargoDate);
                     result.setResultType(type);
                     return result;
                 }else if (collectedFrom.equals(ClaimUtils.DATACITE)){
                     Result result = externalRecordHandler.fetchResultfromDatacite(id);
-...
                     }else {
                         result.setAccessRights(accessRights);
                         result.setEmbargoEndDate(embargoDate);
                         result.setResultType(type);
+                    }
                     return result;
                 }else if (collectedFrom.equals(ClaimUtils.ORCID)){
-...
                     }else {
                         result.setAccessRights(accessRights);
                         result.setEmbargoEndDate(embargoDate);
                         result.setResultType(type);
+                    }
                     return result;
                 }else if (collectedFrom.equals(ClaimUtils.OPENAIRE)){

     services.claims.crossrefUrl=https://api.crossref.org/works?filter=doi:
     services.claims.dataciteUrl=https://api.datacite.org/works/
     services.claims.orcidUrlPrefix=https://pub.orcid.org/v2.1/
     services.claims.orcidUrlSuffix=/works
     services.claims.orcidUrlSuffix=/work/
     services.claims.contextsAPIUrl=http://beta.services.openaire.eu/openaire/context
     services.claims.db.driverClassName = org.postgresql.Driver

Also available in: Unified diff

Project

General

Profile

D-Net

Revision 58494

Added by Argiro Kokogiannaki about 4 years ago