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.

Sign up for GitHub

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

Improved detection of long DOI's within text #7260

Merged
merged 2 commits into from
Dec 28, 2020
Merged

Improved detection of long DOI's within text #7260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40dbd5f
Improved detection of long DOI's within text. fixes #7256.
PremKolar Dec 28, 2020
88b7689
Fix checkstyle
DominikVoigt Dec 28, 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
2 changes: 1 addition & 1 deletion src/main/java/org/jabref/model/entry/identifier/DOI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class DOI implements Identifier {
+ "10" // directory indicator
+ "(?:\\.[0-9]+)+" // registrant codes
+ "[/:]" // divider
+ "(?:[^\\s]+)" // suffix alphanumeric without space
+ "(?:[^\\s,;]+[^,;(\\.\\s)])" // suffix alphanumeric without " "/","/";" and not ending on "."/","/";"
+ ")"; // end group \1

// Regex (Short DOI)
Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/jabref/model/entry/identifier/DOITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,23 @@ private static Stream<Arguments> testData() {
// findDoiInsideArbitraryText
Arguments.of("10.1006/jmbi.1998.2354",
DOI.findInText("other stuff 10.1006/jmbi.1998.2354 end").get().getDOI()),
Arguments.of("10.1007/s10549-018-4743-9",
DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9. ").get().getDOI()),
Arguments.of("10.1007/s10549-018-4743-9",
DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9, ").get().getDOI()),
Arguments.of("10.1007/s10549-018-4743-9",
DOI.findInText("Breast Cancer Res Treat. 2018 July ; 170(1): 77–87. doi:10.1007/s10549-018-4743-9;something else").get().getDOI()),
Arguments.of("10.1007/s10549-018-4743-9.1234",
DOI.findInText("bla doi:10.1007/s10549-018-4743-9.1234 with . in doi").get().getDOI()),

// findShortDoiInsideArbitraryText
Arguments.of("10/12ab", DOI.findInText("other stuff doi:10/12ab end").get().getDOI()),
Arguments.of("10/12ab", DOI.findInText("other stuff /urn:doi:10/12ab end").get().getDOI()),
Arguments.of("10%12ab", DOI.findInText("other stuff doi:10%12ab end").get().getDOI()),
Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab end").get().getDOI()),
Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab, end").get().getDOI()),
Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab. end").get().getDOI()),
Arguments.of("10%12ab", DOI.findInText("other stuff /doi:10%12ab; end").get().getDOI()),
Arguments.of("10/1234", DOI.findInText("10/B(C)/15 \n" +
" \n" +
"10:51 \n" +
Expand Down