Fix Bibtexbrowser URL

Was: staging
Now: production

BibtexbrowserTest.php

@@ -1455,6 +1455,72 @@ class BibtexbrowserTest extends PHPUnit_Framework_TestCase {
       $this->assertEquals(0, count($results));
     }
     
+    function test_tags_pagination() {
+      // Define the page size for pagination
+      bibtexbrowser_configure('TAGS_SIZE', 2);
+      
+      // Create a test BibTeX database with multiple entries and keywords
+      $bibtex = "@article{paper1,title={Paper One},keywords={tagA, tagB},year=2020}
+      @article{paper2,title={Paper Two},keywords={tagC},year=2020}
+      @article{paper3,title={Paper Three},keywords={tagD},year=2020}
+      @article{paper4,title={Paper Four},keywords={tagE},year=2020}";
+      
+      $test_data = fopen('php://memory','r+');
+      fwrite($test_data, $bibtex);
+      fseek($test_data, 0);
+      
+      $db = new BibDataBase();
+      $db->update_internal("inline", $test_data);
+      
+      // Create MenuManager display
+      $display = new MenuManager();
+      $display->setDB($db);
+      
+      // Test the first page
+      $_GET["tags_page"] = '1';
+      ob_start();
+      $display->display();
+      $output1 = ob_get_clean();
+      
+      // Tags are sorted alphabetically.
+      $this->assertStringContainsString('tagA', $output1);
+      $this->assertStringContainsString('tagB', $output1);
+      $this->assertStringNotContainsString('tagC', $output1);
+      
+      // Verify pagination link to the next page
+      $this->assertStringContainsString('keywords_page=2', $output1);
+      
+      // Test the second page
+      $_GET["keywords_page"] = '2';
+      ob_start();
+      $display->display();
+      $output2 = ob_get_clean();
+      
+      $this->assertStringContainsString('tagC', $output2);
+      $this->assertStringContainsString('tagD', $output2);
+      $this->assertStringNotContainsString('tagA', $output2);
+      $this->assertStringNotContainsString('tagE', $output2);
+      
+      // Verify navigation links to previous and next pages
+      $this->assertStringContainsString('keywords_page=1', $output2);
+      $this->assertStringContainsString('keywords_page=3', $output2);
+
+      // Test the third page
+      $_GET["keywords_page"] = '3';
+      ob_start();
+      $display->display();
+      $output3 = ob_get_clean();
+
+      $this->assertStringContainsString('tagE', $output3);
+      $this->assertStringNotContainsString('tagD', $output3);
+
+      // Verify navigation link to the previous page
+      $this->assertStringContainsString('keywords_page=2', $output3);
+      $this->assertStringNotContainsString('keywords_page=4', $output3); // No next page
+
+      // Clean up
+      unset($_GET["keywords_page"]);
+    }
     function test_venuevc_pagination() {
       // Define the page size for pagination
       bibtexbrowser_configure('VENUE_SIZE', 2);
@@ -1520,6 +1586,61 @@ class BibtexbrowserTest extends PHPUnit_Framework_TestCase {
       // Clean up
       unset($_GET["venue_page"]);
     }
+
+    function test_AcademicDisplay() {
+      // Create test BibTeX database with entries from different categories
+        $bibtex = "@article{journal1,title={Journal Article},author={John Doe},journal={Nature},year=2023,type={Journal Articles}}
+        @inproceedings{conf1,title={Conference Paper},author={Jane Smith},booktitle={ICSE},year=2023,type={Refereed Conference Papers}}
+        @book{book1,title={A Book},author={Bob Johnson},publisher={Springer},year=2022,type={Books}}
+        @techreport{tech1,title={Technical Report},author={Alice Brown},institution={MIT},year=2023,type={Technical Reports}}";
+        
+        $test_data = fopen('php://memory','x+');
+        fwrite($test_data, $bibtex);
+        fseek($test_data,0);
+        $db = new BibDataBase();
+        $db->update_internal("inline", $test_data);
+        
+        // Test with BIBTEXBROWSER_ACADEMIC_TOC = true
+        bibtexbrowser_configure('BIBTEXBROWSER_ACADEMIC_TOC', true);
+        
+        $display = new AcademicDisplay();
+        $display->setDB($db);
+        
+        ob_start();
+        $display->display();
+        $output_with_toc = ob_get_clean();
+        
+        // Verify TOC is present
+        // $this->assertStringContainsString('class="btb-menu-toc"', $output_with_toc);
+        $this->assertStringContainsString('Refereed Articles', $output_with_toc);
+        
+        // Verify HTML structure for both cases
+        $xml1 = new SimpleXMLElement("<doc>".$output_with_toc."</doc>");
+        $headers1 = $xml1->xpath('//div[@class="sheader"]');
+        $this->assertEquals(0, count($headers1));
+        $anchors = $xml1->xpath('//h2');
+        $this->assertGreaterThan(3, count($anchors));
+
+
+        // Test with BIBTEXBROWSER_ACADEMIC_TOC = false
+        bibtexbrowser_configure('BIBTEXBROWSER_ACADEMIC_TOC', false);
+        
+        $display2 = new AcademicDisplay();
+        $display2->setDB($db);
+        
+        ob_start();
+        $display2->display();
+        $output_without_toc = ob_get_clean();
+        
+        // Verify TOC is not present
+        $this->assertStringNotContainsString('class="btb-menu-toc"', $output_without_toc);
+        // But category headers should still be present
+        $this->assertStringContainsString('Refereed Articles', $output_without_toc);
+                
+        $xml2 = new SimpleXMLElement("<doc>".$output_without_toc."</doc>");
+        $headers2 = $xml2->xpath('//div[@class="sheader"]');
+        $this->assertGreaterThan(0, count($headers2));
+    }
 } // end class
 
 // Test implementation that records events

README.wiki

@@ -60,10 +60,11 @@ The following uses bibtexbrowser under the hood:
 * [[http://www.monperrus.net/martin/feeding-mysql-database-with-bibtexbrowser|Feeding a MySQL database from the content of a bibtex file]]
 * Publication lists in Wordpress with [[http://www.monperrus.net/martin/wp-publications|wp-publications]]
 * [[http://www.monperrus.net/martin/publication-lists-with-hal-and-bibtexbrowser|Publication lists with HAL and bibtexbrowser]]
+* Generating publication lists in DokuWiki using the [[https://www.dokuwiki.org/plugin:bb4dw|bb4dw plugin]]
 
 =====Demo and screenshot=====
 
-Demo: [[http://bibtexbrowser.sourceforge.net/bibtexbrowser.php?bib=metrics.bib|Here, you can browse a bibtex file dedicated to software metrics]]
+Demo: [[https://www.monperrus.net/martin/bibtexbrowser.php|Here, you can browse a bibtex file of Martin's papers.]]
 
 <img height="500" src="https://www.monperrus.net/martin/bibtexbrowser/bibtexbrowser-screenshot.png" alt="bibtexbrowser screenshot"/>
 

bibtexbrowser.local.php

@@ -3,7 +3,7 @@ bibtexbrowser_configure('ABBRV_TYPE','key');
 // use tabular layout (HTML tables)
 bibtexbrowser_configure('BIBTEXBROWSER_LAYOUT','table');
 // URL to individual files
-bibtexbrowser_configure('BIBTEXBROWSER_URL',"https://publications-staging.zrd-saar.de/");
+bibtexbrowser_configure('BIBTEXBROWSER_URL',"https://publications.zrd-saar.de/");
 // URL to jQuery
 bibtexbrowser_configure('JQUERY_URI', '/static/jquery-3.6.4.min.js');
 // URL to MathJax

bibtexbrowser.php

@@ -236,7 +236,7 @@ if (defined('ENCODING')) {
 @define('BIBTEXBROWSER_URL',basename(__FILE__));
 
 // Specify the location of the cache file for servers that need temporary files written in a specific location
-@define('CACHE_DIR','');
+@define('CACHE_DIR','.');
 
 // Specify the location of the bib file for servers that need do not allow slashes in URLs,
 // where the bib file and bibtexbrowser.php are in different directories. 
@@ -368,7 +368,7 @@ function _zetDB($bibtex_filenames) {
   // ---------------------------- HANDLING caching of compiled bibtex files
   // for sake of performance, once the bibtex file is parsed
   // we try to save a "compiled" in a txt file
-  $compiledbib = CACHE_DIR.'bibtexbrowser_'.md5($bibtex_filenames).'.dat';
+  $compiledbib = c("CACHE_DIR").'/bibtexbrowser_'.md5($bibtex_filenames).'.dat';
 
   $parse=filemtime(__FILE__)>@filemtime($compiledbib);
 
@@ -2584,6 +2584,16 @@ function JanosBibliographyStyle($bibentry) {
 
   $result = implode(", ",$entry).'.';
 
+  // some comments (e.g. acceptance rate)?
+  if ($bibentry->hasField('comment')) {
+      $result .=  " (".$bibentry->getField("comment").")";
+  }
+
+  // some notes (e.g. "accepted for publishing")?
+  if (($type!="misc") && $bibentry->hasField('note')) {
+      $result .=  " (".$bibentry->getField("note").")";
+  }
+
   // add the Coin URL
   $result .=  "\n".$bibentry->toCoins();
 
@@ -2994,7 +3004,7 @@ class MenuManager {
     }  else $page = 1;
 
 
-    if (count($tags)>0) $this->displayMenu('Keywords', $tags, $page, bibtexbrowser_configuration("MENU_SIZE"), Q_TAG_PAGE,
+    if (count($tags)>0) $this->displayMenu('Keywords', $tags, $page, bibtexbrowser_configuration("TAGS_SIZE"), Q_TAG_PAGE,
          Q_TAG);
   }
 
@@ -3477,7 +3487,7 @@ class AcademicDisplay  {
     $this->db = createBibDataBase();
     $this->db->bibdb = $this->entries;
 
-    if (BIBTEXBROWSER_ACADEMIC_TOC != true) {
+    if (c("BIBTEXBROWSER_ACADEMIC_TOC") == false) {
       foreach (_DefaultBibliographySections() as $section) {
         $this->search2html($section['query'],$section['title']);
       }
@@ -3511,7 +3521,7 @@ class AcademicDisplay  {
         echo "\n<a name=\"".$section['anchor']."\"></a>";
         echo "<h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">";
         echo $section['title']." (".$section['count'].")";
-        echo "</h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">\n",
+        echo "</h".BIBTEXBROWSER_HTMLHEADINGLEVEL.">\n";
         $section['display']->display();
       }
     }

makehtml.sh

@@ -54,4 +54,4 @@ done
 
 # Clean up
 rm -rf "temp"
-rm bibtexbrowser_*.dat
+rm -f bibtexbrowser_*.dat