Fixed #636 by using DOICheck and DOIStrip in export filters (#1624)

JabRef · Jul 25, 2016 · fc603b4 · fc603b4
1 parent f90d1d0
commit fc603b4
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ### Fixed
 - Fixed [#1264](https://github.com/JabRef/jabref/issues/1264): S with caron does not render correctly
 - LaTeX to Unicode converter now handles combining accents
+- Fixed [#636](https://github.com/JabRef/jabref/issues/636): DOI in export filters
 - Fixed [#1527](https://github.com/JabRef/jabref/issues/1527): 'Get BibTeX data from DOI' Removes Marking
 - Fixed [#1592](https://github.com/JabRef/jabref/issues/1592): LibreOffice: wrong numbers in citation labels
 

diff --git a/src/main/resources/resource/layout/bibordf.article.layout b/src/main/resources/resource/layout/bibordf.article.layout
@@ -1,10 +1,10 @@
-<bibo:Article rdf:about="http://dx.doi.org/\format[XMLChars]{\doi}">
+<bibo:Article rdf:about="\format[DOICheck,XMLChars]{\doi}">
 
 \begin{title}    <dc:title>\format[XMLChars]{\title}</dc:title>\end{title}
 \begin{year}    <dc:date>\year</dc:date>\end{year}
 \begin{journal}    <dcterms:isPartOf><bibo:Journal><dc:title>\format[XMLChars]{\journal}</dc:title></bibo:Journal></dcterms:isPartOf>\end{journal}
 \begin{volume}    <bibo:volume>\format[XMLChars]{\volume}</bibo:volume>\end{volume}
-\begin{doi}    <bibo:doi>\format[XMLChars]{\doi}</bibo:doi>\end{doi}
+\begin{doi}    <bibo:doi>\format[DOIStrip,XMLChars]{\doi}</bibo:doi>\end{doi}
 
 
 \begin{author}

diff --git a/src/main/resources/resource/layout/bibordf.layout b/src/main/resources/resource/layout/bibordf.layout
@@ -1,8 +1,8 @@
-<bibo:Document rdf:about="http://dx.doi.org/\doi">
+<bibo:Document rdf:about="\format[DOICheck]{\doi}">
 
 \begin{title}    <dc:title>\format[XMLChars]{\title}</dc:title>\end{title}
 \begin{year}    <dc:date>\year</dc:date>\end{year}
-\begin{doi}    <bibo:doi>\format[XMLChars]{\doi}</bibo:doi>\end{doi}
+\begin{doi}    <bibo:doi>\format[DOIStrip,XMLChars]{\doi}</bibo:doi>\end{doi}
 
 \begin{author}
    \format[XMLChars,CreateBibORDFAuthors]{\author}

diff --git a/src/main/resources/resource/layout/bibtexml.layout b/src/main/resources/resource/layout/bibtexml.layout
@@ -21,7 +21,7 @@
 \begin{howpublished}    <bibtex:howpublished>\format[XMLChars]{\howpublished}</bibtex:howpublished>\end{howpublished}
 \begin{abstract}    <bibtex:abstract>\format[XMLChars]{\abstract}</bibtex:abstract>\end{abstract}
 \begin{url}    <bibtex:url>\format[XMLChars]{\url}</bibtex:url>\end{url}
-\begin{doi}    <bibtex:doi>\format[XMLChars]{\doi}</bibtex:doi>\end{doi}
+\begin{doi}    <bibtex:doi>\format[DOIStrip,XMLChars]{\doi}</bibtex:doi>\end{doi}
 \begin{eid}    <bibtex:eid>\format[XMLChars]{\eid}</bibtex:eid>\end{eid}
 \begin{type}    <bibtex:type>\format[XMLChars]{\type}</bibtex:type>\end{type}
 \begin{crossref}    <bibtex:crossref>\format[XMLChars]{\crossref}</bibtex:crossref>\end{crossref}

diff --git a/src/main/resources/resource/layout/html.inbook.layout b/src/main/resources/resource/layout/html.inbook.layout
@@ -7,7 +7,7 @@
 
 		\begin{doi}
 		<div class="bibtex_doi">
-			<a href="http://dx.doi.org/\doi">doi</a>
+			<a href="\format[DOICheck]{\doi}">doi</a>
 		</div>
 		\end{doi}
 

diff --git a/src/main/resources/resource/layout/html.inproceedings.layout b/src/main/resources/resource/layout/html.inproceedings.layout
@@ -7,7 +7,7 @@
 
 		\begin{doi}
 		<div class="bibtex_doi">
-			<a href="http://dx.doi.org/\doi">doi</a>
+			<a href="\format[DOICheck]{\doi}">doi</a>
 		</div>
 		\end{doi}
 

diff --git a/src/main/resources/resource/layout/html.layout b/src/main/resources/resource/layout/html.layout
@@ -7,7 +7,7 @@
 
 		\begin{doi}
 		<div class="bibtex_doi">
-			<a href="http://dx.doi.org/\doi">doi</a>
+			<a href="\format[DOICheck]{\doi}">doi</a>
 		</div>
 		\end{doi}
 

diff --git a/src/main/resources/resource/layout/ris/ris.article.layout b/src/main/resources/resource/layout/ris/ris.article.layout
@@ -8,7 +8,7 @@ TY  - JOUR
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{issn}U1  - \format[FormatChars]{\issn}\end{issn}

diff --git a/src/main/resources/resource/layout/ris/ris.book.layout b/src/main/resources/resource/layout/ris/ris.book.layout
@@ -10,7 +10,7 @@ TY  - BOOK
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{issn}U1  - \format[FormatChars]{\issn}\end{issn}

diff --git a/src/main/resources/resource/layout/ris/ris.conference.layout b/src/main/resources/resource/layout/ris/ris.conference.layout
@@ -11,7 +11,7 @@ TY  - CONF
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{issn}U1  - \format[FormatChars]{\issn}\end{issn}

diff --git a/src/main/resources/resource/layout/ris/ris.incollection.layout b/src/main/resources/resource/layout/ris/ris.incollection.layout
@@ -11,7 +11,7 @@ TY  - CHAP
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{issn}U1  - \format[FormatChars]{\issn}\end{issn}

diff --git a/src/main/resources/resource/layout/ris/ris.inproceedings.layout b/src/main/resources/resource/layout/ris/ris.inproceedings.layout
@@ -11,7 +11,7 @@ TY  - CONF
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{issn}U1  - \format[FormatChars]{\issn}\end{issn}

diff --git a/src/main/resources/resource/layout/ris/ris.layout b/src/main/resources/resource/layout/ris/ris.layout
@@ -11,7 +11,7 @@ TY  - GEN
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.mastersthesis.layout b/src/main/resources/resource/layout/ris/ris.mastersthesis.layout
@@ -6,7 +6,7 @@ TY  - THES
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.patent.layout b/src/main/resources/resource/layout/ris/ris.patent.layout
@@ -7,7 +7,7 @@ TY  - PAT
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.phdthesis.layout b/src/main/resources/resource/layout/ris/ris.phdthesis.layout
@@ -6,7 +6,7 @@ TY  - THES
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.techreport.layout b/src/main/resources/resource/layout/ris/ris.techreport.layout
@@ -9,7 +9,7 @@ TY  - RPRT
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.unpublished.layout b/src/main/resources/resource/layout/ris/ris.unpublished.layout
@@ -6,7 +6,7 @@ TY  - UNPB
 \begin{pages}SP  - \format[FormatChars,FirstPage]{\pages}
 EP  - \format[FormatChars,LastPage]{\pages}\end{pages}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}

diff --git a/src/main/resources/resource/layout/ris/ris.www.layout b/src/main/resources/resource/layout/ris/ris.www.layout
@@ -4,7 +4,7 @@ TY  - ELEC
 \begin{title}T1  - \format[FormatChars]{\title}\end{title}
 \begin{year}Y1  - \format[FormatChars]{\year}\end{year}\begin{month}/\format[FormatChars,RisMonth]{\month}\end{month}
 \begin{url}UR  - \url\end{url}
-\begin{doi}M3  - http://dx.doi.org/\doi\end{doi}
+\begin{doi}M3  - \format[DOICheck]{\doi}\end{doi}
 \begin{keywords}\format[FormatChars,RisKeywords]{\keywords}\end{keywords}
 \begin{file}L1  - \format[FileLink(pdf)]{\file}\end{file}
 \begin{comment}N1  - \format[FormatChars]{\comment}\end{comment}