Skip to content

Commit 21abebe

Browse files
devinluo27Siedlerchr
devinluo27
and
Siedlerchr
authored
Fix for issue 6199: EndNote .xml import to JabRef: PDF links are not imported corrected. (#7667)
* Fix for issue 6199: EndNote .xml import to JabRef: PDF links are not imported correctly. (#6199) * fix issue #6199 finish checkstyle Co-authored-by: Christoph <[email protected]>
1 parent 68095ab commit 21abebe

File tree

7 files changed

+379
-5
lines changed

7 files changed

+379
-5
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
8080
- We fixed an issue with opacity of disabled icon-buttons [#7195](https://github.com/JabRef/jabref/issues/7195)
8181
- We fixed an issue where journal abbreviations in UTF-8 were not recognized [#5850](https://github.com/JabRef/jabref/issues/5850)
8282
- We fixed an issue where the article title with curly brackets fails to download the arXiv link (pdf file). [#7633](https://github.com/JabRef/jabref/issues/7633)
83+
- We fixed an issue where urls must be embedded in a style tag when importing EndNote style Xml files. Now it can parse url with or without a style tag. [#6199](https://github.com/JabRef/jabref/issues/6199)
8384
- We fixed an issue where the article title with colon fails to download the arXiv link (pdf file). [#7660](https://github.com/JabRef/issues/7660)
8485

8586
### Removed

‎src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java

+24-4
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,30 @@ private Optional<String> getUrl(Record record) {
260260
}
261261

262262
private Optional<String> getUrlValue(Url url) {
263-
return Optional.ofNullable(url)
264-
.map(Url::getStyle)
265-
.map(Style::getContent)
266-
.map(this::clean);
263+
Optional<List<Object>> urlContent = Optional.ofNullable(url).map(Url::getContent);
264+
List<Object> list = urlContent.orElse(Collections.emptyList());
265+
Optional<String> ret;
266+
if (list.size() == 0) {
267+
return Optional.empty();
268+
} else {
269+
boolean isStyleExist = false;
270+
int style_index = -1;
271+
for (int i = 0; i < list.size(); i++) {
272+
if (list.get(i) instanceof Style) {
273+
isStyleExist = true;
274+
style_index = i;
275+
}
276+
}
277+
if (!isStyleExist) {
278+
ret = Optional.ofNullable((String) list.get(0))
279+
.map(this::clean);
280+
} else {
281+
ret = Optional.ofNullable((Style) list.get(style_index))
282+
.map(Style::getContent)
283+
.map(this::clean);
284+
}
285+
}
286+
return ret;
267287
}
268288

269289
private List<String> getKeywords(Record record) {

‎src/main/resources/xjc/endnote/endnote.xsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668
</xs:complexType>
669669
</xs:element>
670670
<xs:element name="url">
671-
<xs:complexType>
671+
<xs:complexType mixed="true">
672672
<xs:sequence>
673673
<xs:element minOccurs="0" ref="style"/>
674674
</xs:sequence>

‎src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_WithoutUrlStyle.bib

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@article{,
2+
abstract = {test abstract},
3+
author = {Ahmad, AS and Ormiston-Smith, N and Sasieni, PD},
4+
doi = {10.1038/bjc.2014.606},
5+
file = {:file\://localhost/Users/user/Documents/Bookends/Attachments/Ahmad%20et%20al%202015.pdf:PDF},
6+
isbn = {1532-1827 (Electronic) 0007-0920 (Linking)},
7+
keywords = {Age Factors; Aged; Aged, 80 and over; Female; Great Britain/epidemiology; Humans; Male; Middle Aged; Models, Statistical; Neoplasms/*epidemiology; Risk Assessment; Risk Factors; Sex Characteristics},
8+
number = {5},
9+
pages = {943-7},
10+
title = {Trends in the lifetime risk of developing cancer in Great Britain: comparison of risk for those born from 1930 to 1960},
11+
volume = {112},
12+
year = {2015},
13+
journal = {Br J Cancer},
14+
note = {some notes},
15+
url = {http://www.ncbi.nlm.nih.gov/pubmed/25647015},
16+
}

‎src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_WithoutUrlStyle.xml

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<xml>
3+
<records>
4+
<record>
5+
<database name="Library1.bdb" path="/Users/user/Documents/Bookends/Library1.bdb">Library1.bdb</database>
6+
<source-app name="Bookends" version="13.0.5">Bookends</source-app>
7+
<rec-number>2954</rec-number>
8+
<ref-type name="Journal Article">17</ref-type>
9+
<contributors>
10+
<authors>
11+
<author>
12+
<style face="normal" size="100%">Ahmad, AS</style>
13+
</author>
14+
<author>
15+
<style face="normal" size="100%">Ormiston-Smith, N</style>
16+
</author>
17+
<author>
18+
<style face="normal" size="100%">Sasieni, PD</style>
19+
</author>
20+
</authors>
21+
</contributors>
22+
<auth-address>
23+
<style face="normal" size="100%">Queen Mary University of London, Centre for Cancer Prevention, Wolfson
24+
Institute of Preventive Medicine, Charterhouse Square, London EC1M 6BQ, UK.&#xA;Cancer Research UK,
25+
Head of Statistical Information, Angel Building, 407 St John Street, London EC1V 4AD, UK.
26+
</style>
27+
</auth-address>
28+
<titles>
29+
<title>
30+
<style face="normal" size="100%">Trends in the lifetime risk of developing cancer in Great Britain:
31+
comparison of risk for those born from 1930 to 1960
32+
</style>
33+
</title>
34+
<secondary-title>
35+
<style face="normal" size="100%">Br J Cancer</style>
36+
</secondary-title>
37+
</titles>
38+
<pages>
39+
<style face="normal" size="100%">943-7</style>
40+
</pages>
41+
<number>
42+
<style face="normal" size="100%">5</style>
43+
</number>
44+
<volume>
45+
<style face="normal" size="100%">112</style>
46+
</volume>
47+
<dates>
48+
<year>
49+
<style face="normal" size="100%">2015</style>
50+
</year>
51+
<pub-dates>
52+
<date>
53+
<style face="normal" size="100%">Mar 3</style>
54+
</date>
55+
</pub-dates>
56+
</dates>
57+
<keywords>
58+
<keyword>
59+
<style face="normal" size="100%">Age Factors</style>
60+
</keyword>
61+
<keyword>
62+
<style face="normal" size="100%">Aged</style>
63+
</keyword>
64+
<keyword>
65+
<style face="normal" size="100%">Aged, 80 and over</style>
66+
</keyword>
67+
<keyword>
68+
<style face="normal" size="100%">Female</style>
69+
</keyword>
70+
<keyword>
71+
<style face="normal" size="100%">Great Britain/epidemiology</style>
72+
</keyword>
73+
<keyword>
74+
<style face="normal" size="100%">Humans</style>
75+
</keyword>
76+
<keyword>
77+
<style face="normal" size="100%">Male</style>
78+
</keyword>
79+
<keyword>
80+
<style face="normal" size="100%">Middle Aged</style>
81+
</keyword>
82+
<keyword>
83+
<style face="normal" size="100%">Models, Statistical</style>
84+
</keyword>
85+
<keyword>
86+
<style face="normal" size="100%">Neoplasms/*epidemiology</style>
87+
</keyword>
88+
<keyword>
89+
<style face="normal" size="100%">Risk Assessment</style>
90+
</keyword>
91+
<keyword>
92+
<style face="normal" size="100%">Risk Factors</style>
93+
</keyword>
94+
<keyword>
95+
<style face="normal" size="100%">Sex Characteristics</style>
96+
</keyword>
97+
</keywords>
98+
<abstract>
99+
<style face="normal" size="100%">test abstract
100+
</style>
101+
</abstract>
102+
<notes>
103+
<style face="normal" size="100%">some notes
104+
</style>
105+
</notes>
106+
<urls>
107+
<related-urls>
108+
<url>
109+
<style face="normal" size="100%">http://www.ncbi.nlm.nih.gov/pubmed/25647015</style>
110+
</url>
111+
</related-urls>
112+
<pdf-urls>
113+
<url>
114+
file://localhost/Users/user/Documents/Bookends/Attachments/Ahmad%20et%20al%202015.pdf
115+
</url>
116+
</pdf-urls>
117+
</urls>
118+
<isbn>
119+
<style face="normal" size="100%">1532-1827 (Electronic)&#xD;0007-0920 (Linking)</style>
120+
</isbn>
121+
<electronic-resource-num>
122+
<style face="normal" size="100%">10.1038/bjc.2014.606</style>
123+
</electronic-resource-num>
124+
<accession-num>
125+
<style face="normal" size="100%">25647015</style>
126+
</accession-num>
127+
</record>
128+
</records>
129+
</xml>

‎src/test/resources/org/jabref/logic/importer/fileformat/EndnoteXmlImporterTest_WithoutUrlStyle2.bib

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
@article{,
2+
author = {Chapman, A. G.},
3+
isbn = {0012-9658},
4+
number = {1},
5+
pages = {93-105},
6+
title = {An ecological basis for reforestation of submariginal lands in the Central Hardwood Region},
7+
volume = {18},
8+
year = {1937},
9+
journal = {Ecology},
10+
note = {some notes},
11+
url = {<Go to ISI>://000200148800007}
12+
}
13+
@book{,
14+
author = {Strohecker, H. F.},
15+
isbn = {0012-9658},
16+
number = {1},
17+
journal = {Ecology},
18+
note = {some other notes},
19+
pages = {162-168},
20+
title = {A survey of soil temperatures in the Chicago area},
21+
volume = {18},
22+
url = {<Go to ISI>://000200148800014},
23+
year = {1937}
24+
}

0 commit comments

Comments
 (0)