Skip to content

Fixed the issue where import hangs for ris files with "ER - " failed #7737 #7755

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

Closed
wants to merge 4 commits into from
Closed

Fixed the issue where import hangs for ris files with "ER - " failed #7737 #7755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87e670f
fix the ris importer
Noname690 May 19, 2021
e7ad955
fix RIS importer
Noname690 May 19, 2021
be8f399
add a test for #7737
Noname690 May 20, 2021
6887cfa
add a test
Noname690 May 20, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve

### Fixed

- We fixed an issue where import hangs for ris files with "ER - " failed [#7737](https://github.com/JabRef/jabref/issues/7737)
- We fixed an issue where getting bibliograhpic data from DOI or another identifer did not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/6267)
- We fixed an issue where importing entries would not respect the library mode (BibTeX/biblatex)[#1018](https://github.com/JabRef/jabref/issues/1018)
- We fixed an issue where an exception occured when importing entries from a web search [#7606](https://github.com/JabRef/jabref/issues/7606)
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class RisImporter extends Importer {

private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile("TY - .*");
private static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy");
private static String[] entries;

@Override
public String getName() {
Expand All @@ -54,15 +55,19 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
return reader.lines().anyMatch(line -> RECOGNIZED_FORMAT_PATTERN.matcher(line).find());
}

public String[] getEntries() {
return entries;
}

@Override
public ParserResult importDatabase(BufferedReader reader) throws IOException {
List<BibEntry> bibitems = new ArrayList<>();

// use optional here, so that no exception will be thrown if the file is empty
String linesAsString = reader.lines().reduce((line, nextline) -> line + "\n" + nextline).orElse("");

String[] entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
.split("ER -.*\\n");
entries = linesAsString.replace("\u2013", "-").replace("\u2014", "--").replace("\u2015", "--")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not what I meant with tests. Have a look at the RISImporterTestFiles class.
It searches for test files in /src/test/resources/org/jabref/logic/importer/fileformat that ar named with RISImporterTest....ris
and have a corresponding .bib file with the same name

So you create a minimal RIS file with the ER at the end and a corresponding bib files
This way you can test that the import succeeds without errors

.split("ER -.*(\\n)*");

// stores all the date tags from highest to lowest priority
List<String> dateTags = Arrays.asList("Y1", "PY", "DA", "Y2");
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,14 @@ public void testIfNotRecognizedFormat() throws IOException, URISyntaxException {
Path file = Path.of(RISImporterTest.class.getResource("RisImporterCorrupted.ris").toURI());
assertFalse(importer.isRecognizedFormat(file, StandardCharsets.UTF_8));
}

@Test
public void testIfSplitCorrect(){
String[] entries = importer.gerEntries;
for (String entry : entries) {
assertFalse(entry.equals("ER - "));
}
}


}