Merge pull request #37 from sheffien/master

koppor · koppor · commit a18d679c91d8 · 2015-04-09T11:02:12.000+02:00
Change DOI importer to use application/x-bibtex
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 [master]
-	- Fix for bug #1253: Cleanup entries error 2 (by ruy.takata)
+    - Change the CrossRef content negotiation for bibtex DOI import (by sheffien)
+    - Fix for bug #1253: Cleanup entries error 2 (by ruy.takata)
     - Fix for bug 1213 (sourceforge): Fix encoding for DOI import
     - Feature #809: import pubmed central id (pmc) field from medline
     - Fix undoing Cleanup/Convert to Biblatex
diff --git a/src/main/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java b/src/main/java/net/sf/jabref/imports/DOItoBibTeXFetcher.java
@@ -114,7 +114,7 @@ public BibtexEntry getEntryFromDOI(String doi, OutputPrinter status) {
             return null;
         }
 
-        conn.setRequestProperty("Accept", "text/bibliography; style=bibtex");
+        conn.setRequestProperty("Accept", "application/x-bibtex");
 
 
         String bibtexString;
@@ -158,4 +158,4 @@ public BibtexEntry getEntryFromDOI(String doi, OutputPrinter status) {
         }
         return entry;
     }
-}
+}
diff --git a/src/main/resources/help/About.html b/src/main/resources/help/About.html
@@ -90,6 +90,7 @@ <h2>Contributions from:</h2>
         Moritz Ringler,
         Andreas Rudert,
         Mark Schenk,
+        Nathan Sheffield,
         Rudolf Seemann,
         Toralf Senger,
         Manuel Siebeneicher,

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public BibtexEntry getEntryFromDOI(String doi, OutputPrinter status) {`
`114`	`114`	`return null;`
`115`	`115`	`}`
`116`	`116`
`117`		`- conn.setRequestProperty("Accept", "text/bibliography; style=bibtex");`
	`117`	`+ conn.setRequestProperty("Accept", "application/x-bibtex");`
`118`	`118`
`119`	`119`
`120`	`120`	`String bibtexString;`
`@@ -158,4 +158,4 @@ public BibtexEntry getEntryFromDOI(String doi, OutputPrinter status) {`
`158`	`158`	`}`
`159`	`159`	`return entry;`
`160`	`160`	`}`
`161`		`-}`
	`161`	`+}`