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

fixes a bug (reported by Pawel)

Browse Source 
Section A
<?php
$_GET['bib']='listA.bib';
$_GET['all']=1;
include( 'bibtexbrowser.php' );
?>

Section B
<?php
$_GET['bib']='listB.bib';
$_GET['all']=1;
include( 'bibtexbrowser.php' );
?>

Bug: both times it displays the entries from only listA.bib.

Fix: if (!isset($_GET[Q_DB]) || !$_GET[Q_DB]->is_already_loaded($_GET[Q_FILE])) { setDB(); }
This commit is contained in:
Martin Monperrus
2014-01-30 21:09:54 +01:00
parent 518d22e9ca
commit 7d45c51b6f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bibtexbrowser.php
+11 -1
View File
@@ -2847,17 +2847,27 @@ class BibDataBase {
/** A hashtable of constant strings */ /** A hashtable of constant strings */
var $stringdb; var $stringdb;
/** A list of file names */
var $from_files;
/** Creates a new database by parsing bib entries from the given /** Creates a new database by parsing bib entries from the given
* file. (backward compatibility) */ * file. (backward compatibility) */
function load($filename) { function load($filename) {
$this->from_files[] = $filename;
$this->update($filename); $this->update($filename);
} }
/** Updates a database (replaces the new bibtex entries by the most recent ones) */ /** Updates a database (replaces the new bibtex entries by the most recent ones) */
function update($filename) { function update($filename) {
$this->from_files[] = $filename;
$this->update_internal($filename, NULL); $this->update_internal($filename, NULL);
} }
/** returns true if this file is already loaded in this BibDataBase object */
function is_already_loaded($filename) {
return in_array($filename, $this->from_files);
}
/** See update */ /** See update */
function update_internal($resource_name, $resource) { function update_internal($resource_name, $resource) {
$empty_array = array(); $empty_array = array();
@@ -3563,7 +3573,7 @@ class Dispatcher {
if (!isset($_GET[Q_FILE])) { die('$_GET[\''.Q_FILE.'\'] is not set!'); } if (!isset($_GET[Q_FILE])) { die('$_GET[\''.Q_FILE.'\'] is not set!'); }
// first we set the database (load from disk or parse the bibtex file) // first we set the database (load from disk or parse the bibtex file)
if (!isset($_GET[Q_DB])) { setDB(); } if (!isset($_GET[Q_DB]) || !$_GET[Q_DB]->is_already_loaded($_GET[Q_FILE])) { setDB(); }
// is the publication list included in another page? // is the publication list included in another page?
// strtr is used for Windows where __FILE__ contains C:\toto and SCRIPT_FILENAME contains C:/toto (bug reported by Marco) // strtr is used for Windows where __FILE__ contains C:\toto and SCRIPT_FILENAME contains C:/toto (bug reported by Marco)