fm/zrd-bibtexbrowser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes bug in generated hyperlinks. Closes #40.

Browse Source
This commit is contained in:
Martin Monperrus
2015-09-29 22:56:53 +02:00
parent f0674d94f9
commit 946798f41b
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bibtexbrowser-test.php
+15
View File
@@ -193,6 +193,21 @@ class BTBTest extends PHPUnit_Framework_TestCase {
$this->assertEquals('<a href="myarticle.pdf">[pdf]</a>',$first_entry->getUrlLink()); $this->assertEquals('<a href="myarticle.pdf">[pdf]</a>',$first_entry->getUrlLink());
} }
// https://github.com/monperrus/bibtexbrowser/issues/40
function test_doi_url() {
$test_data = fopen('php://memory','x+');
fwrite($test_data, "@Article{Baldwin2014Quantum,Doi={10.1103/PhysRevA.90.012110},Url={http://link.aps.org/doi/10.1103/PhysRevA.90.012110}}"
);
fseek($test_data,0);
$btb = new BibDataBase();
$btb->update_internal("inline", $test_data);
$first_entry=$btb->bibdb[array_keys($btb->bibdb)[0]];
$this->assertEquals('<pre class="purebibtex">@Article{Baldwin2014Quantum,Doi={<a href="http://dx.doi.org/10.1103/PhysRevA.90.012110">10.1103/PhysRevA.90.012110</a>},Url={<a href="http://link.aps.org/doi/10.1103/PhysRevA.90.012110">http://link.aps.org/doi/10.1103/PhysRevA.90.012110</a>}}</pre>',$first_entry->toEntryUnformatted());
}
} // end class } // end class
?> ?>
bibtexbrowser.php
+10 -1
View File
@@ -1662,13 +1662,22 @@ class BibEntry {
$entry = htmlspecialchars($this->getFullText()); $entry = htmlspecialchars($this->getFullText());
// Fields that should be hyperlinks // Fields that should be hyperlinks
// the order matters
$hyperlinks = array('url' => '%O', 'file' => '%O', 'pdf' => '%O', 'doi' => 'http://dx.doi.org/%O', 'gsid' => 'http://scholar.google.com/scholar?cites=%O'); $hyperlinks = array('url' => '%O', 'file' => '%O', 'pdf' => '%O', 'doi' => 'http://dx.doi.org/%O', 'gsid' => 'http://scholar.google.com/scholar?cites=%O');
$vals = array();
foreach ($hyperlinks as $field => $url) { foreach ($hyperlinks as $field => $url) {
if ($this->hasField($field)) { if ($this->hasField($field)) {
$href = str_replace('%O', $this->getField($field), $url); $href = str_replace('%O', $this->getField($field), $url);
// this is not a parsing but a simple replacement // this is not a parsing but a simple replacement
$entry = str_replace($this->getField($field), '<a'.(BIBTEXBROWSER_LINKS_IN_NEW_WINDOW?' target="_blank" ':'').' href="'.$href.'">'.$this->getField($field).'</a>', $entry); $entry = str_replace($this->getField($field), '___'.$field.'___', $entry);
$vals[$field] = $href;
}
}
foreach ($vals as $field => $href) {
if ($this->hasField($field)) {
// this is not a parsing but a simple replacement
$entry = str_replace('___'.$field.'___', '<a'.(BIBTEXBROWSER_LINKS_IN_NEW_WINDOW?' target="_blank" ':'').' href="'.$href.'">'.$this->getField($field).'</a>', $entry);
} }
} }