Fix ScienceDirect fetcher #3854

JabRef · Mar 15, 2018 · 3a923eb · 3a923eb
1 parent 0ff2ac1
commit 3a923eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -21,6 +21,7 @@
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +54,16 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                             .referrer("http://www.google.com")
                             .ignoreHttpErrors(true).get();
 
+                    // Retrieve PDF link from meta data (most recent)
+                    Elements metaLinks = html.getElementsByAttributeValue("name", "citation_pdf_url");
+
+                    if (!metaLinks.isEmpty()) {
+                        String link = metaLinks.first().attr("content");
+                        return Optional.of(new URL(link));
+                    }
+
                     // Retrieve PDF link (old page)
+                    // TODO: can possibly be removed
                     Element link = html.getElementById("pdfLink");
 
                     if (link != null) {
@@ -62,6 +72,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                         return pdfLink;
                     }
                     // Retrieve PDF link (new page)
+                    // TODO: can possibly be removed
                     String url = html.getElementsByClass("pdf-download-btn-link").attr("href");
 
                     if (url != null) {

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
@@ -31,7 +31,7 @@ void findByDOIOldPage() throws IOException {
         entry.setField("doi", "10.1016/j.jrmge.2015.08.004");
 
         assertEquals(
-                Optional.of(new URL("http://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf")),
+                Optional.of(new URL("https://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf")),
                 finder.findFullText(entry)
         );
     }
@@ -42,7 +42,7 @@ void findByDOINewPage() throws IOException {
         entry.setField("doi", "10.1016/j.aasri.2014.09.002");
 
         assertEquals(
-                Optional.of(new URL("http://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf")),
+                Optional.of(new URL("https://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf")),
                 finder.findFullText(entry)
         );
     }