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

solved bug introduced in revno: 78 and cleaned the parser part related to quotes

Browse Source
This commit is contained in:
Martin Monperrus
2010-10-29 11:32:40 +02:00
parent f7d4b9160b
commit 65ab7476f5
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bibtexbrowser.php
+9 -12
View File
@@ -468,14 +468,14 @@ for ( $i=0; $i < strlen( $sread ); $i++) { $s=$sread[$i];
// the end of the key and no value found: it is the bibtex key e.g. \cite{Descartes1637} // the end of the key and no value found: it is the bibtex key e.g. \cite{Descartes1637}
else if ($s==',') { else if ($s==',') {
$state = GETKEY; $state = GETKEY;
$delegate->setEntryField(trim($finalkey),trim($entryvalue)); $delegate->setEntryField(trim($finalkey),$entryvalue);
$entryvalue=''; // resetting the value buffer $entryvalue=''; // resetting the value buffer
} }
// this is the end of the value AND of the entry // this is the end of the value AND of the entry
else if ($s=='}') { else if ($s=='}') {
$state = NOTHING;$isinentry = false; $state = NOTHING;
$delegate->setEntryField(trim($finalkey),trim($entryvalue)); $delegate->setEntryField(trim($finalkey),$entryvalue);
$delegate->endEntry($entrysource); $isinentry = false;$delegate->endEntry($entrysource);
$entryvalue=''; // resetting the value buffer $entryvalue=''; // resetting the value buffer
} }
else { $entryvalue=$entryvalue.$s;} else { $entryvalue=$entryvalue.$s;}
@@ -545,7 +545,7 @@ for ( $i=0; $i < strlen( $sread ); $i++) { $s=$sread[$i];
// handle anti-slashed brackets // handle anti-slashed brackets
else if ($state==GETVALUEDELIMITEDBYCURLYBRACKETS_3NESTEDLEVEL_ESCAPED) { else if ($state==GETVALUEDELIMITEDBYCURLYBRACKETS_3NESTEDLEVEL_ESCAPED) {
$state = GETVALUEDELIMITEDBYCURLYBRACKETS_3NESTEDLEVEL; $state = GETVALUEDELIMITEDBYCURLYBRACKETS_3NESTEDLEVEL;
$entryvalue=$inentryvaluedelimitedA0.$s; $entryvalue=$entryvalue.$s;
} }
/* handles entries delimited by double quotes */ /* handles entries delimited by double quotes */
@@ -553,18 +553,16 @@ for ( $i=0; $i < strlen( $sread ); $i++) { $s=$sread[$i];
if ($s=='\\') { if ($s=='\\') {
$state = GETVALUEDELIMITEDBYQUOTES_ESCAPED; $state = GETVALUEDELIMITEDBYQUOTES_ESCAPED;
$inentryvaluedelimitedB=$inentryvaluedelimitedB.$s;} $entryvalue=$entryvalue.$s;}
else if ($s=='"') { else if ($s=='"') {
$state = GETVALUE; $state = GETVALUE;
$entryvalue=$entryvalue.$inentryvaluedelimitedB; }
$inentryvaluedelimitedB='';} else { $entryvalue=$entryvalue.$s;}
else { $inentryvaluedelimitedB=@$inentryvaluedelimitedB.$s;}
} }
// handle anti-double quotes // handle anti-double quotes
else if ($state==GETVALUEDELIMITEDBYQUOTES_ESCAPED) { else if ($state==GETVALUEDELIMITEDBYQUOTES_ESCAPED) {
$state = GETVALUEDELIMITEDBYQUOTES; $state = GETVALUEDELIMITEDBYQUOTES;
$inentryvaluedelimitedB = substr($inentryvaluedelimitedB,0,strlen($inentryvaluedelimitedB)-1); $entryvalue=$entryvalue.$s;
$inentryvaluedelimitedB=$inentryvaluedelimitedB.$s;
} }
} // end for } // end for
@@ -650,7 +648,6 @@ class BibDBBuilder {
} }
function setEntryField($finalkey,$entryvalue) { function setEntryField($finalkey,$entryvalue) {
// is it a constant? then we replace the value // is it a constant? then we replace the value
// we support advanced features of bibtexbrowser // we support advanced features of bibtexbrowser
// see http://newton.ex.ac.uk/tex/pack/bibtex/btxdoc/node3.html // see http://newton.ex.ac.uk/tex/pack/bibtex/btxdoc/node3.html