D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

orcid-no-doi #43

Merged
claudio.atzori merged 45 commits from enrico.ottonello/dnet-hadoop:orcid-no-doi into master 2020-12-02 10:55:12 +01:00
Conversation 5 Commits 45 Files Changed 68 +26 -2
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a2fa9dc2f - Show all commits

28
dhp-workflows/dhp-doiboost/src/test/java/eu/dnetlib/doiboost/orcidnodoi/xml/OrcidNoDoiTest.java
View File

@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import com.ximpleware.NavException; import com.ximpleware.NavException;
import com.ximpleware.ParseException; import com.ximpleware.ParseException;
import com.ximpleware.XPathEvalException; import com.ximpleware.XPathEvalException;
@ -218,7 +219,7 @@ public class OrcidNoDoiTest {
.forEach(c -> { .forEach(c -> {
if (am.simpleMatch(c.getCreditName(), author.getName()) || if (am.simpleMatch(c.getCreditName(), author.getName()) ||
am.simpleMatch(c.getCreditName(), author.getSurname()) || am.simpleMatch(c.getCreditName(), author.getSurname()) ||
am.simpleMatch(c.getCreditName(), author.getOtherName())) { am.simpleMatchOnOtherNames(c.getCreditName(), author.getOtherNames())) {
matchCounters.set(0, matchCounters.get(0) + 1); matchCounters.set(0, matchCounters.get(0) + 1);
c.setSimpleMatch(true); c.setSimpleMatch(true);
} }
@ -250,7 +251,7 @@ public class OrcidNoDoiTest {
.forEach(c -> { .forEach(c -> {
if (am.simpleMatch(c.getCreditName(), authorX.getName()) || if (am.simpleMatch(c.getCreditName(), authorX.getName()) ||
am.simpleMatch(c.getCreditName(), authorX.getSurname()) || am.simpleMatch(c.getCreditName(), authorX.getSurname()) ||
am.simpleMatch(c.getCreditName(), authorX.getOtherName())) { am.simpleMatchOnOtherNames(c.getCreditName(), author.getOtherNames())) {
int currentCounter = matchCounters2.get(0); int currentCounter = matchCounters2.get(0);
currentCounter += 1; currentCounter += 1;
matchCounters2.set(0, currentCounter); matchCounters2.set(0, currentCounter);
@ -321,4 +322,27 @@ public class OrcidNoDoiTest {
assertTrue(c.get(0).getCreditName().equals("Khair Abde Daye")); assertTrue(c.get(0).getCreditName().equals("Khair Abde Daye"));
assertTrue(c.get(0).getOid().equals(orcidIdA)); assertTrue(c.get(0).getOid().equals(orcidIdA));
} }
@Test
public void otherNamesMatchTest()
throws VtdException, ParseException, IOException, XPathEvalException, NavException, XPathParseException {
AuthorData author = new AuthorData();
author.setName("Joe");
author.setSurname("Dodge");
author.setOid("0000-1111-2222-3333");
String otherName1 = new String("Joe Dr. Dodge");
String otherName2 = new String("XY");
List<String> others = Lists.newArrayList();
others.add(otherName1);
others.add(otherName2);
author.setOtherNames(others);
Contributor contributor = new Contributor();
contributor.setCreditName("XY");
List<Contributor> contributors = Arrays.asList(contributor);
AuthorMatcher.match(author, contributors);
assertTrue(contributors.get(0).getName().equals("Joe"));
assertTrue(contributors.get(0).getSurname().equals("Dodge"));
assertTrue(contributors.get(0).getOid().equals("0000-1111-2222-3333"));
}
} }