Skip to content

Commit 8ee3f6d

Browse files
authored
Remove OAI2Fetcher (#4140)
* Remove OAI2Fetcher * Remove obsolete language keys
1 parent ceb3370 commit 8ee3f6d

File tree

10 files changed

+10
-675
lines changed

10 files changed

+10
-675
lines changed

src/main/java/org/jabref/gui/importer/fetcher/EntryFetcher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Use {@link SearchBasedEntryFetcher} instead <br>
1313
* Implement this interface to add another activeFetcher (something that grabs records
1414
* from the Web for JabRef). Have a look at the existing implemenations
15-
* OAI2Fetcher, IEEEXploreFetcher, JStorFetcher and
15+
* IEEEXploreFetcher, JStorFetcher and
1616
* CiteSeerEntryFetcher.
1717
*
1818
* Note: You also need to implement the method stopFetching from

src/main/java/org/jabref/gui/importer/fetcher/EntryFetchers.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class EntryFetchers {
1515
public EntryFetchers(JournalAbbreviationLoader abbreviationLoader) {
1616
entryFetchers.add(new CiteSeerXFetcher());
1717
entryFetchers.add(new IEEEXploreFetcher(abbreviationLoader));
18-
// entryFetchers.add(new OAI2Fetcher()); - new arXiv fetcher in place, see below
1918

2019
WebFetchers.getSearchBasedFetchers(Globals.prefs.getImportFormatPreferences()).stream()
2120
.map(SearchBasedEntryFetcher::new)

src/main/java/org/jabref/gui/importer/fetcher/OAI2Fetcher.java

Lines changed: 0 additions & 267 deletions
This file was deleted.

src/main/java/org/jabref/logic/importer/fetcher/ArXiv.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.jabref.logic.importer.IdFetcher;
2424
import org.jabref.logic.importer.ImportFormatPreferences;
2525
import org.jabref.logic.importer.SearchBasedFetcher;
26-
import org.jabref.logic.importer.util.OAI2Handler;
2726
import org.jabref.logic.util.io.XMLUtil;
2827
import org.jabref.logic.util.strings.StringSimilarity;
2928
import org.jabref.model.entry.BibEntry;
@@ -297,7 +296,7 @@ public ArXivEntry(Node item) {
297296

298297
// Title of the article
299298
// The result from the arXiv contains hard line breaks, try to remove them
300-
title = XMLUtil.getNodeContent(item, "title").map(OAI2Handler::correctLineBreaks);
299+
title = XMLUtil.getNodeContent(item, "title").map(ArXivEntry::correctLineBreaks);
301300

302301
// The url leading to the abstract page
303302
urlAbstractPage = XMLUtil.getNodeContent(item, "id");
@@ -306,8 +305,8 @@ public ArXivEntry(Node item) {
306305
publishedDate = XMLUtil.getNodeContent(item, "published");
307306

308307
// Abstract of the article
309-
abstractText = XMLUtil.getNodeContent(item, "summary").map(OAI2Handler::correctLineBreaks)
310-
.map(String::trim);
308+
abstractText = XMLUtil.getNodeContent(item, "summary").map(ArXivEntry::correctLineBreaks)
309+
.map(String::trim);
311310

312311
// Authors of the article
313312
authorNames = new ArrayList<>();
@@ -351,6 +350,12 @@ public ArXivEntry(Node item) {
351350
.flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
352351
}
353352

353+
public static String correctLineBreaks(String s) {
354+
String result = s.replaceAll("\\n(?!\\s*\\n)", " ");
355+
result = result.replaceAll("\\s*\\n\\s*", "\n");
356+
return result.replaceAll(" {2,}", " ").replaceAll("(^\\s*|\\s+$)", "");
357+
}
358+
354359
/**
355360
* Returns the url of the linked pdf
356361
*/

0 commit comments

Comments
 (0)