refdb-cvs Mailing List for RefDB (Page 48)
Status: Beta
Brought to you by:
mhoenicka
Menu
▾
▴
refdb-cvs — All cvs checkins go to this list
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(88) |
Feb
(50) |
Mar
(36) |
Apr
(9) |
May
(30) |
Jun
(30) |
Jul
(22) |
Aug
(16) |
Sep
(42) |
Oct
(18) |
Nov
(29) |
Dec
(23) |
| 2005 |
Jan
(18) |
Feb
(28) |
Mar
(21) |
Apr
(35) |
May
(62) |
Jun
(22) |
Jul
(5) |
Aug
(40) |
Sep
(98) |
Oct
(81) |
Nov
(51) |
Dec
(62) |
| 2006 |
Jan
(46) |
Feb
(36) |
Mar
(8) |
Apr
(16) |
May
(14) |
Jun
(16) |
Jul
(47) |
Aug
(60) |
Sep
(34) |
Oct
(16) |
Nov
(46) |
Dec
(11) |
| 2007 |
Jan
(16) |
Feb
(13) |
Mar
(58) |
Apr
(32) |
May
(4) |
Jun
(8) |
Jul
(31) |
Aug
(46) |
Sep
(22) |
Oct
(30) |
Nov
(58) |
Dec
(15) |
| 2008 |
Jan
(8) |
Feb
(8) |
Mar
(2) |
Apr
(6) |
May
(3) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
(6) |
Nov
(3) |
Dec
(5) |
| 2009 |
Jan
(1) |
Feb
(20) |
Mar
(8) |
Apr
(5) |
May
(8) |
Jun
(3) |
Jul
(6) |
Aug
(4) |
Sep
(7) |
Oct
(8) |
Nov
(2) |
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(4) |
Mar
|
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2011 |
Jan
(5) |
Feb
(5) |
Mar
(13) |
Apr
(3) |
May
|
Jun
|
Jul
(4) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(5) |
Nov
|
Dec
(3) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(13) |
| 2014 |
Jan
(2) |
Feb
(2) |
Mar
(2) |
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
|
Aug
(6) |
Sep
(3) |
Oct
|
Nov
(2) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(5) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2022 |
Jan
(9) |
Feb
(16) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Markus H. <mho...@us...> - 2005-09-17 20:47:29
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30036 Removed Files: Tag: Release_0_9_5_stable refdbkajquery.html Log Message: replaced by refdbkajquery.html.in --- refdbkajquery.html DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:45:27
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29758 Added Files: Tag: Release_0_9_5_stable refdbdbquery.php.in Log Message: replaces refdbdbquery.php --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>RefDB Database query form</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>Database Query Form</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</a></p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p><a href="refdbadd.html">Add new references</a></p> <p>Change database</p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <form action="refdbdbquery.php" method="post" enctype="multipart/form-data"> <? //If the user changed databases, set the SESSION variable if( isset($submit) ) { $_SESSION["database"] = $db; } $database = $_SESSION["database"]; $name = $_SESSION["name"]; $passwd = $_SESSION["passwd"]; $refdbc = $_SESSION["refdbc"]; print "Your current database is: <b>$database</b><br>\n"; //build comand to display databases $cmd = "$refdbc -u $name -w $passwd -c stdout -C listdb"; exec($cmd,$lines); print "<p><select name='db'>\n"; foreach($lines as $line) { print "<option value='$line'>$line</option>\n"; } print "</select></p>\n"; print "<p><input type='submit' name='submit' value='Change Database'></p>\n"; ?> </form> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:44:01
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29504 Removed Files: Tag: Release_0_9_5_stable refdbdbquery.php Log Message: replaced by refdbdbquery.php.in --- refdbdbquery.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:43:09
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29312 Added Files: Tag: Release_0_9_5_stable refdbadmin.php.in Log Message: replaces refdbadmin.php --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>RefDB Admin Interface</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <script language="Javascript"></script> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>RefDB Admin Interface</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</a></p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p><a href="refdbadd.html">Add new references</a></p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <? $name = $_SESSION["name"]; $passwd = $_SESSION["passwd"]; $database = $_SESSION["database"]; ?> <form action="admin.php" method="post" enctype="multipart/form-data"> <!-- ***************************** ADD USER ******************************** --> <h2>Add User</h2> <p>Username: <input type="text" name="user" size="30"></p> <p>Password: <input type="password" name="passwd" size="30"></p> <p>Confirm Password: <input type="password" name="passwdcfm" size="30"></p> <p>To Database: <select name="adduserdb"> <option value='' selected> -- </option> <? //command to list the databases available $refdba = $_SESSION["refdba"]; $listdb = "$refdba -u $name -w $passwd -c stdout -C listdb"; exec($listdb, $dblines); foreach($dblines as $dbline) { print "<option value='$dbline'>$dbline</option>\n"; } ?> </select></p> <p><input type="submit" name="submit" value="Add User"></p> <hr> <!-- **************************** REMOVE USER ***************************** --> <h2>Remove User</h2> <!--Utilize javascript to refresh the page with the new data based on the selection of a database --> <p>From Database: <select name="rmuserdb" onchange="window.location=('refdbadmin.php?dbselected=true&db='+this.options[this.selectedIndex].value)"> <? //If a database hasn't been selected select the blank entry print "<option value=' '"; if( !isset($dbselected ) ) { print " selected"; } print "> -- </option>\n"; foreach($dblines as $dbline) { //once a database has been selected select that database print "<option value='$dbline'"; if( isset($dbselected) && $db == $dbline ) { print " selected"; } print ">$dbline</option>\n"; } ?> </select></p> <? //Display the users for that database if(isset($dbselected)) { //command to list users of a specific database $refdba = $_SESSION["refdba"]; $listuser = "$refdba -u $name -w $passwd -c stdout -d $db -C listuser"; exec($listuser, $userlines); //create dropdown for the users print "<p>User: <select name='rmuser'>\n"; foreach($userlines as $userline) { print "<option value='$userline'>$userline</option>\n"; } print "</select></p>\n"; } ?> <p><input type="submit" name="submit" value="Remove User"></p> <!-- ********************************** CREATE DATABASE **************************** --> <hr> <h2>Create Database</h2> <p>Database Name: <input type="text" name="newdb" size="30"></p> <p><input type="submit" name="submit" value="Add Database"></p> <!-- ********************************* REMOVE DATABASE ***************************** --> <hr> <h2>Remove Database</h2> <p><select name="removedb"> <option value='' selected> -- </option> <? //list databases foreach($dblines as $dbline) { print "<option value='$dbline'>$dbline</option>\n"; } ?> </select></p> <p><input type="submit" name="submit" value="Remove Database"></p> <!-- ***************************** SCHEDULE A KEYWORD SCAN ************************* --> <hr> <h2>Schedule a Keyword Scane</h2> <p><select name="scandb"> <option value=' ' selected> -- </option> <? foreach($dblines as $dbline) { print "<option value='$dbline'>$dbline</option>\n"; } ?> </select></p> <p><input type="submit" name="submit" value="Scan Database"></p> </form> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:42:39
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29223 Removed Files: Tag: Release_0_9_5_stable refdbadmin.php Log Message: replaced by refdbadmin.php.in --- refdbadmin.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:40:50
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28942 Added Files: Tag: Release_0_9_5_stable refdbadd.php.in Log Message: replaces refdbadd.php --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>RefDB add form</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>Add Reference Form</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p>Add new references</p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <? if( $submit == "Add" ) { //if nothing was entered into the add reference text box if( empty($addref) ) { print "Error: No Reference data was entered."; } //Data was entered else { //This set of elseifs was written based on the simple check //in the original access.js file included in the old RefDB //interface. It checks to make sure necessary text for the //particular reference type is there $correct = false; if( $addformat == "ris" ) //RIS format { if( ereg("TY - ",$addref) ) $correct = true; else print "This does not look like RIS data.<br>\n"; } else if( $addformat == "bib2ris" ) //BibTeX format { if( ereg("@", $addref) ) $correct = true; else print "This does not look like BibTeX data.<br>\n"; } else if( $addformat == "med2ris.pl" ) //PubMed { if( ereg("PMID", $addref) ) $correct = true; else print "This does not look like PubMed data.<br>\n"; } //If the reference passes the checks if( $correct ) { //create a temporary file with the reference(s) in it $addref = ereg_replace("\r\n","\n",$addref); $handle = fopen("tempref","wb"); fwrite($handle, $addref); fclose($handle); $name = $_SESSION["name"]; $passwd = $_SESSION["passwd"]; $database = $_SESSION["database"]; $refdbc = $_SESSION["refdbc"]; //refdbc command to add a reference $cmd = "$refdbc -c stdout -u $name -w $passwd -C addref -d $database < tempref"; exec($cmd, $lines); unlink("tempref"); //delete the temp file //print the output foreach($lines as $line) { print $line."<br>\n"; } } print "<br><a href='refdbadd.html'>Add another Reference</a>\n"; } } elseif( $submit == "Add File" ) { if ($referencefile == "none") { echo "Problem: no File Selected"; exit; } if ($referencefile_size==0) { echo "Problem: File is of size zero"; exit; } if (!is_uploaded_file($referencefile)) { echo "File not uploaded successfully"; exit; } if( !move_uploaded_file($referencefile, $referencefile_name) ) { echo "Problem: Could not upload file onto Server"; exit; } $refdbc = $_SESSION["refdbc"]; $cmd = "$refdbc -u $name -w $passwd -d $database -c stdout -C addref $referencefile_name"; exec($cmd, $lines); foreach($lines as $line) { print "$line<br>"; } if( isset($deletefile) ) { unlink($referencefile_name); } } ?> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:39:20
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28505 Removed Files: Tag: Release_0_9_5_stable refdbadd.php Log Message: replaced by refdbadd.php.in --- refdbadd.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:37:39
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28055 Added Files: Tag: Release_0_9_5_stable refdbadd.html.in Log Message: replaces refdbadd.html --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>RefDB add form</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>Add Reference Form</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p>Add new references</p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <form action="refdbadd.php" method="post" enctype="multipart/form-data"> <input type="hidden" name="MAX_FILE_SIZE" value="40000000000"> <h2>Add a reference</h2> <p><input type="radio" name="addformat" value="ris" checked="checked">RIS <input type="radio" name="addformat" value="bib2ris">BibTeX<input type="radio" name="addformat" value="med2ris.pl">Pubmed </p> <textarea name="addref" rows="25" cols="80"></textarea> <p><input type="submit" name="submit" value="Add"><input type="reset" value="Reset form"></p> <p> </p> <h2>Upload a file containing references</h2> <p><input type="file" name="referencefile"></p> <p><b>Delete this file after importing?</b><input type="checkbox" name="deletefile" value="Yes"></p> <p><input type="submit" name="submit" value="Add File"></p> </form> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:35:56
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27819 Removed Files: Tag: Release_0_9_5_stable refdbadd.html Log Message: replaced by refdbadd.html.in --- refdbadd.html DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:33:22
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27491 Added Files: Tag: Release_0_9_5_stable refdb-prl-del.php.in Log Message: replaces refdb-prl-del.php --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!-- Using the RefDB interface general template this file processes deleting a reference entry, as well as adding and removing from personal reference lists --> <html> <head> <title>RefDB query results</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>Results</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</a></p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p><a href="refdbadd.html">Add new references</a></p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <table border> <thead> <tr> <td class="result"> <form action="refdbsearch.php" method="post" enctype="multipart/form-data"> </td> </tr> </thead> <tbody> <? require_once("include.php"); $database = $_SESSION["database"]; $name = $_SESSION["name"]; $passwd = $_SESSION["passwd"]; $refdbc = $_SESSION["refdbc"]; //begin to build the command to send to refdbc $cmd = "$refdbc -c stdout -d $database -u $name -w $passwd -C "; if( isset($deleteref) ) //if you're deleting a reference { $cmd = $cmd."deleteref "; } else if( isset($pickref) ) //if you're adding it to your personal list { $cmd = $cmd."pickref "; } else if( isset($unpickref) ) //if you're removing it from your personal list { $cmd = $cmd."pickref -r "; } else //if somehow you get to this page not from the search results { print "Error!"; } //This for loop concatenates the references to be deleted/added/removed for( $checkboxNumber = 1; $checkboxNumber <= $numberOfCheckBoxes; $checkboxNumber++) { $checkIndex = "checkbox".$checkboxNumber; if( isset($_POST[$checkIndex] ) ) //if the box is checked { $number = $_POST[$checkIndex]; $cmd = $cmd.$number." "; //concatenate to the list } } exec($cmd, $lines); //execute the command foreach($lines as $line) //print the output { print $line."<br>\n"; } print "<br><br>"; //These variables are used if you return to the Search Results print "<input type='hidden' name='return' value='$terms'>\n"; print "<input type='hidden' name='scope' value='$scope'>\n"; print "<input type='submit' name='sendQuery' value='Return to Search Results'>\n"; ?> </tbody> </table> </form> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:32:19
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27259 Removed Files: Tag: Release_0_9_5_stable refdb-prl-del.php Log Message: replaced by refdb-prl-del.php.in --- refdb-prl-del.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:29:30
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26728 Added Files: Tag: Release_0_9_5_stable login.php.in Log Message: replaces login.php --- NEW FILE --- <? //Written by Tom Bartolucci 2005 //Basica login sets the SESSION and COOKIE for this RefDB user session_start(); $_SESSION["passwd"] = $passwd; $_SESSION["name"] = $name; $_SESSION["database"] = $database; $_SESSION["refdbc"] = "<bindir>/refdbc"; $_SESSION["refdba"] = "<bindir>/refdba"; $result = setcookie(session_name(),session_id(), time()+7200); ?> <html> <head> <title>Logging In...</title> <meta http-equiv="REFRESH" content="0; URL=refdbquery.html"> </head> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:28:35
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26574 Removed Files: Tag: Release_0_9_5_stable login.php Log Message: replaced by login.php.in --- login.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:27:11
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26342 Added Files: Tag: Release_0_9_5_stable index.html.in Log Message: replaces index.html --- NEW FILE --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <!--Modified from the original RefDB interface to be used as a login portal to the web interface. --> <html> <head> <title>RefDB Login form</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>RefDB Login Form</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</a></p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p><a href="refdbadd.html">Add new references</a></p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <form action="login.php" method="post" enctype="multipart/form-data"> <p>Your RefDB username: <input type="text" name="name" size="16" maxlength="16"></p> <p>Your RefDB password: <input type="password" name="passwd" size="16" maxlength="16"></p> <p>Use database <input type="text" name="database"></p> <p><input type="submit" value="Login"></p> </form> </td> </tr> <tr> <td class="navbar"> </td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:26:19
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26133 Removed Files: Tag: Release_0_9_5_stable index.html Log Message: replaced by index.html.in --- index.html DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:24:53
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25816 Added Files: Tag: Release_0_9_5_stable admin.php.in Log Message: replaces admin.php --- NEW FILE --- <? //admin.php written by Tom Bartolucci 2005 //Contains all the methods to process the admin actions from refdbadmin.php ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title>RefDB Admin Interface</title> <link href="refdbq.css" type="text/css" rel="stylesheet"> </head> <script language="Javascript"></script> <body> <table width="100%" cellspacing="0" border> <tbody valign="top"> <tr> <td class="navbar" width="25%"><h1>RefDB</h1></td> <td class="main"><h1>RefDB Admin Interface</h1></td> </tr> <tr> <td class="navbar"> </td> <td class="main"> </td> </tr> <tr> <td class="navbar"> <p><a href="refdbquery.html">Search references</a></p> <p><a href="refdbkajquery.html">Search keywords, authors, journals</a></p> <p><a href="refdbadd.html">Add new references</a></p> <p><a href="refdbdbquery.php">Change database</a></p> <p><a href="refdblogout.php">Logout</a></p> </td> <td class="main"> <? $name = $_SESSION["name"]; $passwd = $_SESSION["passwd"]; $database = $_SESSION["database"]; if( $submit == "Add User") { } else if( $submit == "Remove User") { } else if( $submit == "Add Database") { } else if( $submit == "Remove Database") { } else if( $submit == "Scan Database") { } print "<p><a href='refdbadmin.php'>Return to the Admin Interface</a></p>\n"; ?> </td> </tr> <tr> <td class="navbar"><p><a href="refdbadmin.php">Admin Interface</a></p></td> <td class="footer"><p><a href="http://refdb.sourceforge.net">RefDB</a> reference manager and bibliography tool V. <!--VERSION-->Version<!--/VERSION--></p></td> </td> </tr> </tbody> </table> </body> </html> |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:24:24
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25720 Removed Files: Tag: Release_0_9_5_stable admin.php Log Message: replaced by admin.php.in --- admin.php DELETED --- |
|
From: Markus H. <mho...@us...> - 2005-09-17 20:20:19
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24889 Added Files: Tag: Release_0_9_5_stable Makefile.am Log Message: initial version --- NEW FILE --- ## Process this file with automake to produce Makefile.in objects = index.html login.php refdbquery.html refdbsearch.php refdbadmin.php admin.php refdb-prl-del.php refdbadd.html refdbadd.php refdbdbquery.php refdbkajquery.html refdbkajsearch.php refdblogout.php staticfiles = include.php refdbq.css css = refdb.css EXTRA_DIST = index.html.in login.php.in refdbquery.html.in refdbsearch.php.in refdbadmin.php.in admin.php.in refdb-prl-del.php.in refdbadd.html.in refdbadd.php.in refdbdbquery.php.in refdbkajquery.html.in refdbkajsearch.php.in refdblogout.php.in $(staticfiles) $(css) MOSTLYCLEANFILES=$(objects) all: $(objects) $(objects): %: %.in sed 's%<!--VERSION-->.*<!--/VERSION-->%<!--VERSION-->$(VERSION)<!--/VERSION-->%' < $< | \ sed 's%<bindir>%$(bindir)%' > $@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/www chmod 1777 $(DESTDIR)$(pkgdatadir)/www @for f in $(objects) $(staticfiles); do \ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/www/$$f; \ done chmod 755 $(DESTDIR)$(pkgdatadir)/www/*.php $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/css @for f in $(css); do \ $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/css/$$f; \ done |
|
From: Tom B. <tba...@us...> - 2005-09-15 12:19:28
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19354/phpweb Modified Files: Tag: Release_0_9_5_stable admin.php index.html refdb-prl-del.php refdbadmin.php refdbdbquery.php refdbkajquery.html refdbquery.html refdbsearch.php Log Message: added: enctype="multipart/form-data" to all html forms Index: admin.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/admin.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- admin.php 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ admin.php 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -36,34 +36,18 @@ $database = $_SESSION["database"]; - $cmd = "refdba -u $name -w $passwd -c stdout -C "; - if( $submit == "Add User") { - if( $pass == $passcfm ) - { - $cmd = $cmd."adduser -d $adduserdb -N $pass $user"; - } } else if( $submit == "Remove User") { - $cmd = $cmd."adduser -r -d $rmuserdb $rmuser"; } else if( $submit == "Add Database") { - $cmd = $cmd."createdb $newdb"; } else if( $submit == "Remove Database") { - $cmd = $cmd."deletedb $removedb"; } else if( $submit == "Scan Database") { - $cmd = $cmd."scankw $scandb"; - } - - exec($cmd, $lines); - foreach($lines as $line) - { - print $line."<br>\n"; } Index: index.html =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/index.html,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- index.html 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ index.html 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -29,5 +29,5 @@ </td> <td class="main"> - <form action="login.php" method="post"> + <form action="login.php" method="post" enctype="multipart/form-data"> <p>Your RefDB username: <input type="text" name="name" size="16" maxlength="16"></p> <p>Your RefDB password: <input type="password" name="passwd" size="16" maxlength="16"></p> Index: refdb-prl-del.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdb-prl-del.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdb-prl-del.php 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdb-prl-del.php 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -35,5 +35,5 @@ <tr> <td class="result"> - <form action="refdbsearch.php" method="post"> + <form action="refdbsearch.php" method="post" enctype="multipart/form-data"> </td> </tr> Index: refdbadmin.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbadmin.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdbadmin.php 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdbadmin.php 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -32,11 +32,11 @@ $database = $_SESSION["database"]; ?> - <form action="admin.php" method="post"> + <form action="admin.php" method="post" enctype="multipart/form-data"> <!-- ***************************** ADD USER ******************************** --> <h2>Add User</h2> <p>Username: <input type="text" name="user" size="30"></p> - <p>Password: <input type="password" name="pass" size="30"></p> - <p>Confirm Password: <input type="password" name="passcfm" size="30"></p> + <p>Password: <input type="password" name="passwd" size="30"></p> + <p>Confirm Password: <input type="password" name="passwdcfm" size="30"></p> <p>To Database: <select name="adduserdb"> <option value='' selected> -- </option> Index: refdbdbquery.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbdbquery.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdbdbquery.php 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdbdbquery.php 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -25,5 +25,5 @@ </td> <td class="main"> - <form action="refdbdbquery.php" method="post"> + <form action="refdbdbquery.php" method="post" enctype="multipart/form-data"> <? //If the user changed databases, set the SESSION variable Index: refdbkajquery.html =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbkajquery.html,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdbkajquery.html 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdbkajquery.html 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -25,5 +25,5 @@ </td> <td class="main"> - <form action="refdbkajsearch.php" method="post"> + <form action="refdbkajsearch.php" method="post" enctype="multipart/form-data"> <h2>Query</h2> <p> <input type="text" name="kajquery"> in <select name="kajqueryfield"> Index: refdbquery.html =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbquery.html,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdbquery.html 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdbquery.html 15 Sep 2005 12:19:19 -0000 1.1.2.3 @@ -25,5 +25,5 @@ </td> <td class="main"> - <form action="refdbsearch.php" method="post"> + <form action="refdbsearch.php" method="post" enctype="multipart/form-data"> <p>Display also the following fields:</p> <p> Index: refdbsearch.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbsearch.php,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -U2 -r1.1.2.3 -r1.1.2.4 --- refdbsearch.php 12 Sep 2005 18:01:12 -0000 1.1.2.3 +++ refdbsearch.php 15 Sep 2005 12:19:19 -0000 1.1.2.4 @@ -57,5 +57,5 @@ <tr><td class="result"> - <form action="refdb-prl-del.php" method="post"> + <form action="refdb-prl-del.php" method="post" enctype="multipart/form-data"> <input type="submit" value="Delete selected references" name="deleteref"> <input type="submit" value="Add selected references to Personal List" name="pickref"> |
|
From: Tom B. <tba...@us...> - 2005-09-12 18:01:20
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27986/phpweb Modified Files: Tag: Release_0_9_5_stable refdbsearch.php Log Message: Updated so that class tags are printed in the html of search results Index: refdbsearch.php =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/refdbsearch.php,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -U2 -r1.1.2.2 -r1.1.2.3 --- refdbsearch.php 7 Sep 2005 21:31:45 -0000 1.1.2.2 +++ refdbsearch.php 12 Sep 2005 18:01:12 -0000 1.1.2.3 @@ -161,9 +161,9 @@ { print "<br>Your Search for <b>$terms</b> generated no results<br><br>\n"; - print $cmd; } //Your search generated results display them else { + $lineNumber = 1; foreach( $lines as $line ) { @@ -171,4 +171,5 @@ if( substr($line,0,2) == "ID" ) { + $lineNumber = 1; print "</div></td></tr>\n"; print "<tr><td class='result'>\n"; @@ -184,8 +185,59 @@ print "<div class='record'>\n"; print "<h2 class='ID'>$line</h2>\n"; + $lineNumber++; + } + elseif( substr($line,0,3) == "Key" ) + { + print "<p class='citekey'>$line</p>\n"; + $lineNumber++; + } + elseif($lineNumber == 3) + { + print "<p class='authors'>Authors: $line</p>\n"; + $lineNumber++; + } + elseif($lineNumber == 4) + { + print "<p class='title'>$line</p>\n"; + $lineNumber++; + } + elseif($lineNumber == 5) + { + print "<p><em class='periodical'>$line</em></p>\n"; + $lineNumber++; + } + elseif( substr($line,0,8) == "ABSTRACT") + { + print "<p class='abstract'>$line</p>\n"; + } + elseif( substr($line,0,7) == "REPRINT" ) + { + print "<p class='reprint'>$line</p>\n"; + } + elseif( substr($line,0,4) == "ISSN") + { + print "<p class='issn'>$line</p>\n"; + } + elseif( substr($line,0,4) == "CITY") + { + print "<p class='city'>$line</p>\n"; + } + elseif( substr($line,0,5) == "NOTES" ) + { + print "<p class='notes'>$line</p>\n"; + } + elseif( substr($line,0,3) == "URL" ) + { + $len = strlen($line); + $url = substr($line, 4,$len); + print "<p class='url'><a href='$url'>$line</a></p>\n"; + } + elseif( substr($line,0,9) == "PUBLISHER") + { + print "<p class='publisher'>$line</p>\n"; } else { - print "$line<br>\n"; + print "<p>$line</p>\n"; } } |
|
From: Tom B. <tba...@us...> - 2005-09-12 18:00:40
|
Update of /cvsroot/refdb/refdb/phpweb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27684/phpweb Modified Files: Tag: Release_0_9_5_stable CHANGELOG Log Message: Updated refdbsearch.php so that class tags are in the html of search results Index: CHANGELOG =================================================================== RCS file: /cvsroot/refdb/refdb/phpweb/CHANGELOG,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -U2 -r1.2.2.2 -r1.2.2.3 --- CHANGELOG 7 Sep 2005 21:31:45 -0000 1.2.2.2 +++ CHANGELOG 12 Sep 2005 18:00:31 -0000 1.2.2.3 @@ -1,2 +1,6 @@ +09/12/2005 + +-Updated refdbsearch.php to print the "class" tags when displaying the search results + 09/07/2005 |
|
From: Markus H. <mho...@us...> - 2005-09-11 20:01:27
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5628 Modified Files: Tag: Release_0_9_5_stable risdb.c Log Message: removed unused local vars Index: risdb.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/risdb.c,v retrieving revision 1.44.2.9 retrieving revision 1.44.2.10 diff -u -U2 -r1.44.2.9 -r1.44.2.10 --- risdb.c 7 Sep 2005 23:45:03 -0000 1.44.2.9 +++ risdb.c 11 Sep 2005 20:01:20 -0000 1.44.2.10 @@ -3451,5 +3451,4 @@ unsigned long long n_xuser_id = 0; /* xid of set_owner regarding current ref */ - unsigned long long numrows; dbi_result dbires; dbi_result dbires1; @@ -3521,5 +3520,4 @@ unsigned long long n_note_id; /* note_id of a search result */ unsigned long long n_xnote_id = 0; /* xnote_id of a search result */ - unsigned long long numrows; dbi_result dbires; dbi_result dbires1; |
|
From: Markus H. <mho...@us...> - 2005-09-11 20:00:14
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5208 Modified Files: Tag: Release_0_9_5_stable backend-risx.c Log Message: export url as link with type url Index: backend-risx.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v retrieving revision 1.30.2.8 retrieving revision 1.30.2.9 diff -u -U2 -r1.30.2.8 -r1.30.2.9 --- backend-risx.c 6 Aug 2005 22:52:12 -0000 1.30.2.8 +++ backend-risx.c 11 Sep 2005 20:00:05 -0000 1.30.2.9 @@ -738,4 +738,5 @@ size_t buffer1_len; int nhave_data = 0; + int i; /* printf("in add_pubinfo_risx\n"); */ @@ -846,14 +847,40 @@ /*----------------------------------------------------------------*/ - /* URL */ - if ((item = get_refdb_url_copy(ptr_rendinfo->dbires)) != NULL) { - nhave_data = 1; - if (print_element_x(item, &buffer1, &buffer1_len, "url", NULL, NULL, ptr_indent) == NULL) { - free((char*)item); - free(buffer1); + /* URL, L1 through L4 */ + + /* loop over all link types */ + for (i=0; i<5;i++) { + char ulink_type[10]; + dbi_result dbires; + + dbires = request_ulinks(conn, my_dbi_result_get_idval(ptr_rendinfo->dbires, "refdb_id"), 0 /* ref entry */, i /* link type */); + if (dbires == NULL) { return NULL; } - free((char*)item); - } + + while ((item = get_ulink(dbires)) != NULL) { + if (i == 0) { + strcpy(ulink_type, "url"); + } + else if (i == 1) { + strcpy(ulink_type, "pdf"); + } + else if (i == 2) { + strcpy(ulink_type, "fulltext"); + } + else if (i == 3) { + strcpy(ulink_type, "related"); + } + else if (i == 4) { + strcpy(ulink_type, "image"); + } + if (print_element_x(item, &buffer1, &buffer1_len, "link", "type", ulink_type, ptr_indent) == NULL) { + clean_request(dbires); + return NULL; + } + } + + clean_request(dbires); + } /* end for */ /*----------------------------------------------------------------*/ |
|
From: Markus H. <mho...@us...> - 2005-09-11 19:58:18
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4898 Modified Files: Tag: Release_0_9_5_stable dbfncs.c dbfncs.h Log Message: new function my_dbi_result_get_short_idval() Index: dbfncs.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/dbfncs.c,v retrieving revision 1.15.2.13 retrieving revision 1.15.2.14 diff -u -U2 -r1.15.2.13 -r1.15.2.14 --- dbfncs.c 7 Sep 2005 23:35:38 -0000 1.15.2.13 +++ dbfncs.c 11 Sep 2005 19:58:10 -0000 1.15.2.14 @@ -480,5 +480,4 @@ "refdb_title_series TEXT," "refdb_address TEXT," - "refdb_url TEXT," "refdb_issn VARCHAR(255)," "refdb_pyother_info VARCHAR(255)," @@ -493,8 +492,4 @@ "refdb_misc2 VARCHAR(255)," "refdb_misc3 VARCHAR(255)," - "refdb_linkpdf TEXT," - "refdb_linkfull TEXT," - "refdb_linkrel TEXT," - "refdb_linkimg TEXT," "PRIMARY KEY (refdb_id))"); @@ -712,4 +707,31 @@ dbi_result_free(dbires); + /* create the link table */ + + /* this will implicitly create a SEQUENCE t_link_link_id_seq */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_link (" + "link_id BIGSERIAL," + "link_url TEXT NOT NULL," + "PRIMARY KEY (link_id))"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + + /* create link_url index */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_link_url ON t_link (link_url)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + /* create the author xtable */ /* this will implicitly create a SEQUENCE t_xauthor_xauthor_id_seq */ @@ -879,4 +901,63 @@ dbi_result_free(dbires); + /* create the links xtable */ + /* this will implicitly create a SEQUENCE t_xlink_xlink_id_seq */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_xlink (" + "xlink_id BIGSERIAL," + "link_id BIGINT NOT NULL," + "xref_id BIGINT NOT NULL," + "xlink_type VARCHAR(11) DEFAULT \'URL\'," + "xlink_source VARCHAR(11) DEFAULT \'REFERENCE\'," + "PRIMARY KEY (xlink_id))"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + /* create x_link indices */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_link_id ON t_xlink (link_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xref_id ON t_xlink (xref_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlink_type ON t_xlink (xlink_type)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlink_source ON t_xlink (xlink_source)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + /* create user permissions */ /* PostgreSQL uses table-based permissions, so it is easier to create @@ -897,5 +978,5 @@ } - sprintf(buffer, "GRANT SELECT, INSERT, UPDATE, DELETE ON t_meta, t_refdb, t_author, t_keyword, t_periodical, t_user, t_note, t_xauthor, t_xkeyword, t_xuser, t_xnote, t_refdb_refdb_id_seq, t_author_author_id_seq, t_keyword_keyword_id_seq, t_periodical_periodical_id_seq, t_user_user_id_seq, t_note_note_id_seq, t_xauthor_xauthor_id_seq, t_xkeyword_xkeyword_id_seq, t_xuser_xuser_id_seq, t_xnote_xnote_id_seq TO GROUP %suser", ptr_clrequest->argument); + sprintf(buffer, "GRANT SELECT, INSERT, UPDATE, DELETE ON t_meta, t_refdb, t_author, t_keyword, t_periodical, t_user, t_note, t_link, t_xauthor, t_xkeyword, t_xuser, t_xnote, t_xlink, t_refdb_refdb_id_seq, t_author_author_id_seq, t_keyword_keyword_id_seq, t_periodical_periodical_id_seq, t_user_user_id_seq, t_note_note_id_seq, t_link_link_id_seq, t_xauthor_xauthor_id_seq, t_xkeyword_xkeyword_id_seq, t_xuser_xuser_id_seq, t_xnote_xnote_id_seq, t_xlink_xlink_id_seq TO GROUP %suser", ptr_clrequest->argument); LOG_PRINT(LOG_DEBUG, buffer); @@ -951,5 +1032,4 @@ "refdb_title_series TEXT," "refdb_address TEXT," - "refdb_url TEXT," "refdb_issn TEXT," "refdb_pyother_info TEXT," @@ -963,9 +1043,5 @@ "refdb_misc1 TEXT," "refdb_misc2 TEXT," - "refdb_misc3 TEXT," - "refdb_linkpdf TEXT," - "refdb_linkfull TEXT," - "refdb_linkrel TEXT," - "refdb_linkimg TEXT)"); + "refdb_misc3 TEXT)"); @@ -1181,4 +1257,28 @@ dbi_result_free(dbires); + /* create the link table */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_link (" + "link_id INTEGER PRIMARY KEY," + "link_url TEXT NOT NULL)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + + /* create t_link table index */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_link_url ON t_link (link_url)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + /* create the author xtable */ dbires = dbi_conn_query(conn, "CREATE TABLE t_xauthor (" @@ -1340,4 +1440,61 @@ dbi_result_free(dbires); + /* create the links xtable */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_xlink (" + "xlink_id INTEGER PRIMARY KEY," + "link_id INTEGER NOT NULL," + "xref_id INTEGER NOT NULL," + "xlink_type TEXT DEFAULT \'URL\'," + "xlink_source TEXT DEFAULT \'REFERENCE\')"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + /* create t_xlink table indexes */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_linkid ON t_xlink (link_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xrefid ON t_xlink (xref_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlinktype ON t_xlink (xlink_type)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlinksource ON t_xlink (xlink_source)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + return 0; } @@ -1382,5 +1539,4 @@ "refdb_title_series TEXT," "refdb_address TEXT," - "refdb_url TEXT," "refdb_issn TEXT," "refdb_pyother_info TEXT," @@ -1394,9 +1550,5 @@ "refdb_misc1 TEXT," "refdb_misc2 TEXT," - "refdb_misc3 TEXT," - "refdb_linkpdf TEXT," - "refdb_linkfull TEXT," - "refdb_linkrel TEXT," - "refdb_linkimg TEXT)"); + "refdb_misc3 TEXT)"); @@ -1612,4 +1764,28 @@ dbi_result_free(dbires); + /* create the link table */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_link (" + "link_id INTEGER PRIMARY KEY," + "link_url TEXT NOT NULL)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + + /* create t_link table index */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_link_url ON t_link (link_url)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(257)); + return 257; + } + + dbi_result_free(dbires); + /* create the author xtable */ dbires = dbi_conn_query(conn, "CREATE TABLE t_xauthor (" @@ -1771,4 +1947,61 @@ dbi_result_free(dbires); + /* create the links xtable */ + dbires = dbi_conn_query(conn, "CREATE TABLE t_xlink (" + "xlink_id INTEGER PRIMARY KEY," + "link_id BIGINT NOT NULL," + "xref_id BIGINT NOT NULL," + "xlink_type TEXT DEFAULT \'URL\'," + "xlink_source TEXT DEFAULT \'REFERENCE\')"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + /* create t_xlink table indexes */ + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_linkid ON t_xlink (link_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xrefid ON t_xlink (xref_id)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlinktype ON t_xlink (xlink_type)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + + dbires = dbi_conn_query(conn, "CREATE INDEX i_xlink_xlinksource ON t_xlink (xlink_source)"); + + + if (!dbires) { + LOG_PRINT(LOG_ERR, get_status_msg(258)); + return 258; + } + + dbi_result_free(dbires); + return 0; } @@ -2227,4 +2460,45 @@ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + my_dbi_result_get_short_idval(): returns an id value by field name. Takes + care of the fact that some db servers use + longlongs where ints are expected + + unsigned int my_dbi_result_get_short_idval returns an id value + + dbi_result dbires result of a previous query + + const char* fieldname name of the field to retrieve + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +unsigned int my_dbi_result_get_short_idval(dbi_result dbires, const char* fieldname) { + dbi_conn conn; + char buffer[512]; + const char *fakeid; + unsigned int field_attrib; + unsigned int the_uint; + unsigned long long the_ulonglong; + + conn = dbi_result_get_conn(dbires); + + field_attrib = dbi_result_get_field_attrib(dbires, fieldname, DBI_INTEGER_SIZE4, DBI_INTEGER_SIZE4); +/* printf("field_type went to %d\n", (int)field_type); */ + + if (field_attrib) { + /* value is a 4-byte integer */ + the_uint = dbi_result_get_uint(dbires, fieldname); +/* sprintf(buffer, "ulong: u %u<< lu %lu<< llu %llu", the_ulong, the_ulong, the_ulong); */ +/* LOG_PRINT(LOG_DEBUG, buffer); */ + return the_uint; + } + else { + /* value is an 8-byte integer. Cast to uint */ + the_ulonglong = dbi_result_get_ulonglong(dbires, fieldname); +/* sprintf(buffer, "ulonglong: u %u<< lu %lu<< llu %llu", the_ulonglong, the_ulonglong, the_ulonglong); */ +/* LOG_PRINT(LOG_DEBUG, buffer); */ + return (unsigned int)the_ulonglong; + } +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ my_dbi_conn_get_versioninfo(): retrieves the version info of a db engine Index: dbfncs.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/dbfncs.h,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -U2 -r1.6.2.4 -r1.6.2.5 --- dbfncs.h 26 Jul 2005 20:21:45 -0000 1.6.2.4 +++ dbfncs.h 11 Sep 2005 19:58:10 -0000 1.6.2.5 @@ -59,4 +59,5 @@ unsigned long long my_dbi_result_get_idval(dbi_result dbires, const char* fieldname); unsigned long long my_dbi_result_get_idval_idx(dbi_result dbires, unsigned int idx); +unsigned int my_dbi_result_get_short_idval(dbi_result dbires, const char* fieldname); int my_dbi_conn_get_versioninfo(dbi_conn conn, struct VERSIONINFO* ptr_ver); |
|
From: Markus H. <mho...@us...> - 2005-09-11 19:55:20
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4260 Modified Files: Tag: Release_0_9_5_stable backend-bibtex.c backend-dbib.c backend-dbiba.c backend.c backend.h refdbda.c refdbdbib.c xmlhandler.c xmlhandler.h xmlout.c Log Message: fixed uint vs. ulonglong mismatches in citation style data Index: backend-bibtex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-bibtex.c,v retrieving revision 1.16.2.5 retrieving revision 1.16.2.6 diff -u -U2 -r1.16.2.5 -r1.16.2.6 --- backend-bibtex.c 7 Sep 2005 23:45:00 -0000 1.16.2.5 +++ backend-bibtex.c 11 Sep 2005 19:55:11 -0000 1.16.2.6 @@ -110,5 +110,5 @@ int errcode; /* receives error code when retrieving periodical */ int n_multiple_db = 0; /* if 1, driver supports multiple databases per conn */ - unsigned long long n_id; + unsigned int n_id; char have_author = 0; char *new_ref; @@ -189,5 +189,5 @@ if (dbi_result_next_row(dbirescit)) { - n_id = my_dbi_result_get_idval_idx(dbirescit, 1); + n_id = my_dbi_result_get_short_idval(dbirescit, "ID"); if (!load_style(type, n_id, bibconns.conn_refdb)) { LOG_PRINT(LOG_WARNING, get_status_msg(234)); Index: backend-dbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v retrieving revision 1.28.2.8 retrieving revision 1.28.2.9 diff -u -U2 -r1.28.2.8 -r1.28.2.9 --- backend-dbib.c 7 Sep 2005 23:45:00 -0000 1.28.2.8 +++ backend-dbib.c 11 Sep 2005 19:55:11 -0000 1.28.2.9 @@ -605,8 +605,8 @@ /* item_entry_id checked for non-NULL above */ ptr_biblio_info->entry_id = item_entry_id; - ptr_biblio_info->n_refdb_id = my_dbi_result_get_idval(dbires3, "n_refdb_id"); + ptr_biblio_info->n_refdb_id = my_dbi_result_get_idval(dbires3, "refdb_id"); - author_concat = dbi_result_get_string(dbires2, "author_concat"); + author_concat = my_dbi_result_get_string(dbires2, "author_concat"); n_currpos = dbi_result_get_int(dbires2, "sorted_pos"); n_pubyear = dbi_result_get_short(dbires2, "pubyear"); @@ -1100,4 +1100,5 @@ int n_intext = 0; /* 0 = bibliography, 1 = intext, 2 = intext subseq */ int n_status; + int errflag; unsigned int n_id; unsigned int n_refstyle_id; @@ -1150,5 +1151,6 @@ } - n_id = dbi_result_get_uint(dbires_cit, "ID"); + n_id = my_dbi_result_get_short_idval(dbires_cit, "ID"); + if (!load_style(pubtype, n_id, ptr_bibconns->conn_refdb)) { free(sql_command); @@ -1171,6 +1173,7 @@ } - n_refstyle_id = dbi_result_get_uint(dbi_style_res, "ID"); - if (dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { + + n_refstyle_id = my_dbi_result_get_short_idval(dbi_style_res, "ID"); + if ((errflag = dbi_conn_error_flag(ptr_bibconns->conn_refdb)) != 0) { /* ToDo: jump out here? */ LOG_PRINT(LOG_WARNING, get_status_msg(241)); Index: backend-dbiba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbiba.c,v retrieving revision 1.26.2.12 retrieving revision 1.26.2.13 diff -u -U2 -r1.26.2.12 -r1.26.2.13 --- backend-dbiba.c 10 Aug 2005 19:45:59 -0000 1.26.2.12 +++ backend-dbiba.c 11 Sep 2005 19:55:11 -0000 1.26.2.13 @@ -38,4 +38,5 @@ #include "risdb.h" #include "authorinfo.h" +#include "connect.h" extern int n_log_level; @@ -1417,5 +1418,4 @@ else if (n_pubyear) { /* no formatting */ -/* printf("here4\n"); */ nhave_content = 1; @@ -1454,5 +1454,4 @@ item = my_dbi_result_get_string_copy_idx(dbires_ref, n_following_index); if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ -/* printf("here5\n"); */ if (sgml_entitize(&item, NULL) == NULL) { LOG_PRINT(LOG_WARNING, outomem.text); @@ -1748,4 +1747,223 @@ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + format_ulink(): formats the url/link part of a + bibliography entry as a DocBook bibliomixed text + + char* format_ulink returns ptr to the buffer if successful, NULL if failed + + char** ptr_ref ptr to a ptr to a buffer created with malloc which will receive + the output. The calling function must allocate the buffer + with at least 4096 byte. This function will reallocate the + buffer as needed. *ptr will be updated whenever a realloc is + necessary. The calling function is responsible for freeing the + memory again. + + size_t* ptr_ref_len ptr to an int holding the current length of ref. + Will be modified if ref is reallocated. + + dbi_result dbires ptr to a dbi result structure containing the + current reference + + dbi_result dbires_ref ptr to a dbi result structure containing the + reference style + + int type 0=url, 1=pdf, 2=fulltext, 3=related, 4=image + + int n_intext 0 = bibliography citation; 1 = intext citation; 2 = + intext citation subsequent + + int n_preceeding_index the index of the preceeding stuff in dbires_ref + + int n_following_index the index of the following stuff in dbires_ref + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +char* format_ulink(char** ptr_ref, size_t* ptr_ref_len, struct BIBCONNS* ptr_bibconns, dbi_result dbires, dbi_result dbires_ref, int type, int n_intext, int n_preceeding_index, int n_following_index) { + char* new_ref; + char start_tag[512]; + char *item; + char *preceeding; + char *following; + char *entitize_string; + const char *citem; + int nhave_content = 0; + unsigned int n_stringsize; + dbi_result dbires_ulink; + +/* printf("start format_ulink\n"); */ + dbires_ulink = request_ulinks(ptr_bibconns->conn, my_dbi_result_get_idval(dbires, "refdb_id"), 0 /* ref entry */, type /* link type */); + if (dbires_ulink == NULL) { + LOG_PRINT(LOG_DEBUG, "requesting links failed"); + return NULL; + } + + if (!dbi_result_get_numrows(dbires_ulink)) { + clean_request(dbires); + + /* return unaltered string */ + return *ptr_ref; + } + + preceeding = my_dbi_result_get_string_copy_idx(dbires_ref, n_preceeding_index); + if (preceeding && *preceeding && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ + if (sgml_entitize(&preceeding, NULL) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + free(preceeding); + return NULL; + } + } + + following = my_dbi_result_get_string_copy_idx(dbires_ref, n_following_index); + if (following && *following && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ + if (sgml_entitize(&following, NULL) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + free(following); + if (preceeding) { + free(preceeding); + } + return NULL; + } + } + + + if ((new_ref = mstrcat(*ptr_ref, "<bibliomisc>", ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + clean_request(dbires); + return NULL; + } + else { + *ptr_ref = new_ref; + } + + + while ((citem = get_ulink(dbires_ulink)) != NULL) { + if (preceeding) { + if ((new_ref = mstrcat(*ptr_ref, preceeding, ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + free(preceeding); + if (following) { + free(following); + } + return NULL; + } + else { + *ptr_ref = new_ref; + } + } + + if ((entitize_string = strdup(citem)) == NULL + || sgml_entitize(&entitize_string, NULL) == NULL) { + clean_request(dbires); + if (preceeding) { + free(preceeding); + } + if (following) { + free(following); + } + return NULL; + } + + if (!type) { + snprintf(start_tag, 512, "<ulink role=\"url\" url=\"%s\">", entitize_string); + } + else if (type == 1) { + snprintf(start_tag, 512, "<ulink role=\"pdf\" url=\"%s\">", entitize_string); + } + else if (type == 2) { + snprintf(start_tag, 512, "<ulink role=\"fulltext\" url=\"%s\">", entitize_string); + } + else if (type == 3) { + snprintf(start_tag, 512, "<ulink role=\"related\" url=\"%s\">", entitize_string); + } + else if (type == 4) { + snprintf(start_tag, 512, "<ulink role=\"image\" url=\"%s\">", citem); + } + + + if ((new_ref = mstrcat(*ptr_ref, start_tag, ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + clean_request(dbires); + if (preceeding) { + free(preceeding); + } + if (following) { + free(following); + } + return NULL; + } + else { + *ptr_ref = new_ref; + } + + if ((new_ref = mstrcat(*ptr_ref, entitize_string, ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + clean_request(dbires); + if (preceeding) { + free(preceeding); + } + if (following) { + free(following); + } + return NULL; + } + else { + *ptr_ref = new_ref; + } + + free(entitize_string); + + if ((new_ref = mstrcat(*ptr_ref, "</ulink>", ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + clean_request(dbires); + if (preceeding) { + free(preceeding); + } + if (following) { + free(following); + } + return NULL; + } + else { + *ptr_ref = new_ref; + } + + if (following) { + if ((new_ref = mstrcat(*ptr_ref, following, ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_WARNING, outomem.text); + free(following); + if (preceeding) { + free(preceeding); + } + return NULL; + } + else { + *ptr_ref = new_ref; + } + } + } /* end while */ + + clean_request(dbires_ulink); + + if (preceeding) { + free(preceeding); + } + if (following) { + free(following); + } + + if ((new_ref = mstrcat(*ptr_ref, "</bibliomisc>", ptr_ref_len, 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + clean_request(dbires); + return NULL; + } + else { + *ptr_ref = new_ref; + } + +/* printf("end format_ulink:%s\n", *ref); */ + + return *ptr_ref; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ format_journalname(): formats the journalname part of a bibliography entry as a DocBook bibliomixed text @@ -2627,5 +2845,5 @@ struct BIBCONNS* ptr_bibconns ptr to structure with database connections - unsigned long long separator_id the ID of the separator + unsigned int separator_id the ID of the separator ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.27.2.6 retrieving revision 1.27.2.7 diff -u -U2 -r1.27.2.6 -r1.27.2.7 --- backend.c 7 Sep 2005 23:45:01 -0000 1.27.2.6 +++ backend.c 11 Sep 2005 19:55:11 -0000 1.27.2.7 @@ -2509,10 +2509,10 @@ const char* pubtype ptr to string with the publication type - char* citestyle_id ptr to string with the ID of the citation style + unsigned int citstyle_id the ID of the citation style dbi_conn conn database connection ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ -dbi_result load_style(const char* pubtype, unsigned long long citstyle_id, dbi_conn conn) { +dbi_result load_style(const char* pubtype, unsigned int citstyle_id, dbi_conn conn) { int error; char* sql_command; @@ -2525,5 +2525,4 @@ return NULL; } - drivername = dbi_driver_get_name(dbi_conn_get_driver(conn)); @@ -2745,28 +2744,32 @@ 211 ABSTRACTFOLLOWING 212 ABSTRACTSTYLE - 213 LINK1PRECEEDING - 214 LINK1FOLLOWING - 215 LINK1STYLE - 216 LINK2PRECEEDING - 217 LINK2FOLLOWING - 218 LINK2STYLE - 219 LINK3PRECEEDING - 220 LINK3FOLLOWING - 221 LINK3STYLE - 222 LINK4PRECEEDING - 223 LINK4FOLLOWING - 224 LINK4STYLE + 213 LINK0PRECEEDING + 214 LINK0FOLLOWING + 215 LINK0STYLE + 216 LINK1PRECEEDING + 217 LINK1FOLLOWING + 218 LINK1STYLE + 219 LINK2PRECEEDING + 220 LINK2FOLLOWING + 221 LINK2STYLE + 222 LINK3PRECEEDING + 223 LINK3FOLLOWING + 224 LINK3STYLE + 225 LINK4PRECEEDING + 226 LINK4FOLLOWING + 227 LINK4STYLE */ /* now retrieve matching style information from REFSTYLE into*/ if (!strcmp(my_dbi_conn_get_cap(conn, "multiple_db"), "t")) { - sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from %s.REFSTYLE where PUBTYPE='%s' and CITSTYLEID="ULLSPEC, MAIN_DB, pubtype, (unsigned long long)citstyle_id); + sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK0PRECEEDING, LINK0FOLLOWING, LINK0STYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from %s.REFSTYLE where PUBTYPE='%s' and CITSTYLEID=%u", MAIN_DB, pubtype, citstyle_id); } else { - sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from REFSTYLE where PUBTYPE='%s' and CITSTYLEID="ULLSPEC, pubtype, (unsigned long long)citstyle_id); + sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK0PRECEEDING, LINK0FOLLOWING, LINK0STYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from REFSTYLE where PUBTYPE='%s' and CITSTYLEID=%u", pubtype, citstyle_id); } LOG_PRINT(LOG_DEBUG, sql_command); dbi_style_res = dbi_conn_query(conn, sql_command); + if (!dbi_style_res) { dbi_conn_error(conn, (const char**)&sql_command); @@ -2781,8 +2784,8 @@ dbi_result_free(dbi_style_res); if (!strcmp(my_dbi_conn_get_cap(conn, "multiple_db"), "t")) { - sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from %s.REFSTYLE where PUBTYPE='GEN' and CITSTYLEID="ULLSPEC, MAIN_DB, (unsigned long long)citstyle_id); + sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK0PRECEEDING, LINK0FOLLOWING, LINK0STYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from %s.REFSTYLE where PUBTYPE='GEN' and CITSTYLEID=%u", MAIN_DB, citstyle_id); } else { - sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from REFSTYLE where PUBTYPE='GEN' and CITSTYLEID="ULLSPEC, (unsigned long long)citstyle_id); + sprintf(sql_command, "SELECT ID, QSTYLE, XSTYLE, YSTYLE, ZSTYLE, QABBREVIATEFIRST, XABBREVIATEFIRST, YABBREVIATEFIRST, ZABBREVIATEFIRST, QABBREVIATESUBSEQ, XABBREVIATESUBSEQ, YABBREVIATESUBSEQ, ZABBREVIATESUBSEQ, QABBREVIATEFIRSTMAXAUTHOR, XABBREVIATEFIRSTMAXAUTHOR, YABBREVIATEFIRSTMAXAUTHOR, ZABBREVIATEFIRSTMAXAUTHOR, QABBREVIATESUBSEQMAXAUTHOR, XABBREVIATESUBSEQMAXAUTHOR, YABBREVIATESUBSEQMAXAUTHOR, ZABBREVIATESUBSEQMAXAUTHOR, QABBREVIATEFIRSTDISPLAYAUTHOR, XABBREVIATEFIRSTDISPLAYAUTHOR, YABBREVIATEFIRSTDISPLAYAUTHOR, ZABBREVIATEFIRSTDISPLAYAUTHOR, QABBREVIATESUBSEQDISPLAYAUTHOR, XABBREVIATESUBSEQDISPLAYAUTHOR, YABBREVIATESUBSEQDISPLAYAUTHOR, ZABBREVIATESUBSEQDISPLAYAUTHOR, QAEMPTY, XAEMPTY, YAEMPTY, ZAEMPTY, QASAME, XASAME, YASAME, ZASAME, QPRECEEDING, XPRECEEDING, YPRECEEDING, ZPRECEEDING, QFOLLOWING, XFOLLOWING, YFOLLOWING, ZFOLLOWING, QAUTHORSEPSTWOSEPS, XAUTHORSEPSTWOSEPS, YAUTHORSEPSTWOSEPS, ZAUTHORSEPSTWOSEPS, QAUTHORSEPSTHREESEPSTHREESEPSEACH, XAUTHORSEPSTHREESEPSTHREESEPSEACH, YAUTHORSEPSTHREESEPSTHREESEPSEACH, ZAUTHORSEPSTHREESEPSTHREESEPSEACH, QAUTHORSEPSTHREESEPSTHREESEPSLAST, XAUTHORSEPSTHREESEPSTHREESEPSLAST, YAUTHORSEPSTHREESEPSTHREESEPSLAST, ZAUTHORSEPSTHREESEPSTHREESEPSLAST, QAUTHORNAMESNAMEFIRSTNAMEORDER, XAUTHORNAMESNAMEFIRSTNAMEORDER, YAUTHORNAMESNAMEFIRSTNAMEORDER, ZAUTHORNAMESNAMEFIRSTNAMEORDER, QAUTHORNAMESNAMEFIRSTINITIALSTYLE, XAUTHORNAMESNAMEFIRSTINITIALSTYLE, YAUTHORNAMESNAMEFIRSTINITIALSTYLE, ZAUTHORNAMESNAMEFIRSTINITIALSTYLE, QAUTHORNAMESNAMEFIRSTUPPERCASE, XAUTHORNAMESNAMEFIRSTUPPERCASE, YAUTHORNAMESNAMEFIRSTUPPERCASE, ZAUTHORNAMESNAMEFIRSTUPPERCASE, QAUTHORNAMESNAMEOTHERNAMEORDER, XAUTHORNAMESNAMEOTHERNAMEORDER, YAUTHORNAMESNAMEOTHERNAMEORDER, ZAUTHORNAMESNAMEOTHERNAMEORDER, QAUTHORNAMESNAMEOTHERINITIALSTYLE, XAUTHORNAMESNAMEOTHERINITIALSTYLE, YAUTHORNAMESNAMEOTHERINITIALSTYLE, ZAUTHORNAMESNAMEOTHERINITIALSTYLE, QAUTHORNAMESNAMEOTHERUPPERCASE, XAUTHORNAMESNAMEOTHERUPPERCASE, YAUTHORNAMESNAMEOTHERUPPERCASE, ZAUTHORNAMESNAMEOTHERUPPERCASE, QTEXTTEXTSINGLEPRECEEDING, XTEXTTEXTSINGLEPRECEEDING, YTEXTTEXTSINGLEPRECEEDING, ZTEXTTEXTSINGLEPRECEEDING, QTEXTTEXTSINGLEFOLLOWING, XTEXTTEXTSINGLEFOLLOWING, YTEXTTEXTSINGLEFOLLOWING, ZTEXTTEXTSINGLEFOLLOWING, QTEXTTEXTMULTIPLEPRECEEDING, XTEXTTEXTMULTIPLEPRECEEDING, YTEXTTEXTMULTIPLEPRECEEDING, ZTEXTTEXTMULTIPLEPRECEEDING, QTEXTTEXTMULTIPLEFOLLOWING, XTEXTTEXTMULTIPLEFOLLOWING, YTEXTTEXTMULTIPLEFOLLOWING, ZTEXTTEXTMULTIPLEFOLLOWING, PUBDATEPRECEEDING, PUBDATEFOLLOWING, PUBDATEFORMAT, PUBDATESEQUENCE, PUBDATEMONTHFORMAT, PUBDATEDAYFORMAT, PUBDATEYEARFORMAT, PUBDATEPADLEADINGZERO, PUBDATESTYLE, PUBDATESECPRECEEDING, PUBDATESECFOLLOWING, PUBDATESECFORMAT, PUBDATESECSEQUENCE, PUBDATESECMONTHFORMAT, PUBDATESECDAYFORMAT, PUBDATESECYEARFORMAT, PUBDATESECPADLEADINGZERO, PUBDATESECSTYLE, PUBDATEALLPRECEEDING, PUBDATEALLFOLLOWING, PUBDATEALLFORMAT, PUBDATEALLSEQUENCE, PUBDATEALLMONTHFORMAT, PUBDATEALLDAYFORMAT, PUBDATEALLYEARFORMAT, PUBDATEALLPADLEADINGZERO, PUBDATEALLSTYLE, TITLEPRECEEDING, TITLEFOLLOWING, TITLECASE, TITLESTYLE, BOOKTITLEPRECEEDING, BOOKTITLEFOLLOWING, BOOKTITLECASE, BOOKTITLESTYLE, SERIESTITLEPRECEEDING, SERIESTITLEFOLLOWING, SERIESTITLECASE, SERIESTITLESTYLE, ALLTITLEPRECEEDING, ALLTITLEFOLLOWING, ALLTITLECASE, ALLTITLESTYLE, JOURNALNAMEPRECEEDING, JOURNALNAMEFOLLOWING, JOURNALNAMECASE, JOURNALNAMEDEFAULTTEXT, JOURNALNAMEALTERNATETEXT, JOURNALNAMEPUNCTUATION, JOURNALNAMESTYLE, VOLUMEPRECEEDING, VOLUMEFOLLOWING, VOLUMESTYLE, ISSUEPRECEEDING, ISSUEFOLLOWING, ISSUESTYLE, PAGESSTYLE, PAGESSINGLEPAGEPRECEEDING, PAGESSINGLEPAGEFOLLOWING, PAGESPAGERANGEPRECEEDING, PAGESPAGERANGEFOLLOWING, PAGESPAGERANGETYPE, PUBLISHERPRECEEDING, PUBLISHERFOLLOWING, PUBLISHERSTYLE, PUBPLACEPRECEEDING, PUBPLACEFOLLOWING, PUBPLACESTYLE, PAGESPRECEEDING, PAGESFOLLOWING, REFNUMBERPRECEEDING, REFNUMBERFOLLOWING, REFNUMBERSTYLE, PUBDATEFIRSTSEP, PUBDATESECONDSEP, PUBDATESECFIRSTSEP, PUBDATESECSECONDSEP, PUBDATEALLFIRSTSEP, PUBDATEALLSECONDSEP, PAGESPAGERANGERANGESEPARATOR, SERIALPRECEEDING, SERIALFOLLOWING, SERIALSTYLE, ADDRESSPRECEEDING, ADDRESSFOLLOWING, ADDRESSSTYLE, USERDEF1PRECEEDING, USERDEF1FOLLOWING, USERDEF1STYLE, USERDEF2PRECEEDING, USERDEF2FOLLOWING, USERDEF2STYLE, USERDEF3PRECEEDING, USERDEF3FOLLOWING, USERDEF3STYLE, USERDEF4PRECEEDING, USERDEF4FOLLOWING, USERDEF4STYLE, USERDEF5PRECEEDING, USERDEF5FOLLOWING, USERDEF5STYLE, MISC1PRECEEDING, MISC1FOLLOWING, MISC1STYLE, MISC2PRECEEDING, MISC2FOLLOWING, MISC2STYLE, MISC3PRECEEDING, MISC3FOLLOWING, MISC3STYLE, NOTESPRECEEDING, NOTESFOLLOWING, NOTESSTYLE, ABSTRACTPRECEEDING, ABSTRACTFOLLOWING, ABSTRACTSTYLE, LINK0PRECEEDING, LINK0FOLLOWING, LINK0STYLE, LINK1PRECEEDING, LINK1FOLLOWING, LINK1STYLE, LINK2PRECEEDING, LINK2FOLLOWING, LINK2STYLE, LINK3PRECEEDING, LINK3FOLLOWING, LINK3STYLE, LINK4PRECEEDING, LINK4FOLLOWING, LINK4STYLE from REFSTYLE where PUBTYPE='GEN' and CITSTYLEID=%u", citstyle_id); } Index: backend.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.h,v retrieving revision 1.23.2.3 retrieving revision 1.23.2.4 diff -u -U2 -r1.23.2.3 -r1.23.2.4 --- backend.h 7 Sep 2005 23:45:02 -0000 1.23.2.3 +++ backend.h 11 Sep 2005 19:55:12 -0000 1.23.2.4 @@ -155,5 +155,5 @@ char* assemble_header(struct renderinfo* ptr_rendinfo); -dbi_result load_style(const char* pubtype, unsigned long long citstyle_id, dbi_conn conn); +dbi_result load_style(const char* pubtype, unsigned int citstyle_id, dbi_conn conn); void unload_style(); Index: refdbda.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v retrieving revision 1.41.2.17 retrieving revision 1.41.2.18 diff -u -U2 -r1.41.2.17 -r1.41.2.18 --- refdbda.c 15 Aug 2005 00:21:55 -0000 1.41.2.17 +++ refdbda.c 11 Sep 2005 19:55:12 -0000 1.41.2.18 @@ -70,4 +70,6 @@ static long limit_open(void); +void log_dberror(dbi_conn Conn, void *user_argument); + /* additional types */ #ifndef socklen_t @@ -447,4 +449,7 @@ } + /* register dbi error handler */ + dbi_conn_error_handler(conn, log_dberror, NULL); + LOG_PRINT(LOG_DEBUG, "connected to database server using database:"); LOG_PRINT(LOG_DEBUG, my_db); @@ -452,4 +457,11 @@ } +void log_dberror(dbi_conn conn, void *user_argument) { + const char *msg; + + dbi_conn_error(conn, &msg); + LOG_PRINT(LOG_DEBUG, msg); +} + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ viewstat(): executes client command viewstat Index: refdbdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v retrieving revision 1.36.2.23 retrieving revision 1.36.2.24 diff -u -U2 -r1.36.2.23 -r1.36.2.24 --- refdbdbib.c 7 Sep 2005 23:45:02 -0000 1.36.2.23 +++ refdbdbib.c 11 Sep 2005 19:55:12 -0000 1.36.2.24 @@ -604,13 +604,13 @@ sprintf(sql_command, "SELECT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos FROM %s WHERE sorted_pos>0 ORDER BY citation_pos, pubyear DESC, monthday DESC, author_concat, periodical, volume, issue, startpage", table_name); } - } + } else if (strcmp(bibsequence, "BAUTHORDATE") == 0) { - sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos FROM %s ORDER BY author_concat, pubyear, monthday, volume, issue, article_title, periodical, startpage", table_name); + sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos, monthday FROM %s ORDER BY author_concat, pubyear, monthday, volume, issue, article_title, periodical, startpage", table_name); } else if (strcmp(bibsequence, "BDATEASC") == 0) { - sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos FROM %s ORDER BY pubyear, monthday, author_concat, volume, issue, article_title, periodical, startpage", table_name); + sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos, monthday FROM %s ORDER BY pubyear, monthday, author_concat, volume, issue, article_title, periodical, startpage", table_name); } else if (strcmp(bibsequence, "BDATEDESC") == 0) { - sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos FROM %s ORDER BY pubyear DESC, monthday DESC, author_concat, volume, issue, article_title, periodical, startpage", table_name); + sprintf(sql_command, "SELECT DISTINCT dbname, orig_id, author_concat, pubyear, article_title, periodical, volume, issue, startpage, entry_id, year_uni_suffix, sorted_pos, monthday FROM %s ORDER BY pubyear DESC, monthday DESC, author_concat, volume, issue, article_title, periodical, startpage", table_name); } @@ -811,4 +811,5 @@ goto FinishLoop; } + ptr_biblio_info->year_unique_suffix = dbi_result_get_string(dbires, "year_uni_suffix"); @@ -1566,7 +1567,7 @@ int position; /* position of an element in PUBTYPE or INTEXTDEF */ int set_count; /* number of finished CITESTYLE elements */ - unsigned long long citstyle_id; /* id of the current CITSTYLE element */ - unsigned long long refstyle_id; /* id of the current REFSTYLE element */ - unsigned long long separator_id; /* id of the current SEPARATORS element */ + unsigned int citstyle_id; /* id of the current CITSTYLE element */ + unsigned int refstyle_id; /* id of the current REFSTYLE element */ + unsigned int separator_id; /* id of the current SEPARATORS element */ struct elstack *ptr_first; /* start of the element stack */ char the_journal[256]; /* current journal name */ @@ -1705,5 +1706,5 @@ int i; int set_count = 0; /* counter for datasets */ - unsigned long long n_id; + unsigned int n_id; char* sql_command = NULL; char* myarg; @@ -1796,6 +1797,6 @@ char *stylename; - n_id = my_dbi_result_get_idval_idx(dbires, 1); - stylename = my_dbi_result_get_string_copy_idx(dbires, 2); + n_id = my_dbi_result_get_short_idval(dbires, "ID"); + stylename = my_dbi_result_get_string_copy(dbires, "JOURNAL"); if (!remove_style(conn, n_id)) { sprintf(sql_command, "419:"ULLSPEC":%s\n", (unsigned long long)n_id, (stylename) ? stylename:""); @@ -2014,5 +2015,5 @@ if (dbires) { while (dbi_result_next_row(dbires)) { /* should run only once */ - citstyle_id = my_dbi_result_get_idval(dbires, "ID"); + citstyle_id = my_dbi_result_get_short_idval(dbires, "ID"); /* start citestyle */ @@ -2026,10 +2027,10 @@ /* loop over all publication types */ - sprintf(sql_command, "SELECT ID,PUBTYPE FROM REFSTYLE WHERE CITSTYLEID="ULLSPEC" AND PUBTYPE!=\'INTEXT\' AND PUBTYPE!=\'AUTHORONLY\' AND PUBTYPE!=\'YEARONLY\'", (unsigned long long)citstyle_id); + sprintf(sql_command, "SELECT ID,PUBTYPE FROM REFSTYLE WHERE CITSTYLEID=%u AND PUBTYPE!=\'INTEXT\' AND PUBTYPE!=\'AUTHORONLY\' AND PUBTYPE!=\'YEARONLY\'", citstyle_id); dbires_ref = dbi_conn_query(conn, sql_command); LOG_PRINT(LOG_DEBUG, sql_command); if (dbires_ref) { while (dbi_result_next_row(dbires_ref)) { - refstyle_id = my_dbi_result_get_idval(dbires_ref, "ID"); + refstyle_id = my_dbi_result_get_short_idval(dbires_ref, "ID"); iwrite_pubtype(ptr_clrequest, my_dbi_result_get_string(dbires_ref, "PUBTYPE"), citstyle_id, conn); @@ -2334,6 +2335,6 @@ int error; int error_count = 0; - unsigned long long n_id1; - unsigned long long n_id2; + unsigned int n_id1; + unsigned int n_id2; dbi_result dbires; dbi_result dbires1; @@ -2344,5 +2345,5 @@ } - sprintf(sql_command, "SELECT ID FROM REFSTYLE WHERE CITSTYLEID="ULLSPEC, (unsigned long long)n_id); + sprintf(sql_command, "SELECT ID FROM REFSTYLE WHERE CITSTYLEID=%u", n_id); dbires = dbi_conn_query(conn, sql_command); LOG_PRINT(LOG_DEBUG, sql_command); @@ -2351,5 +2352,5 @@ } while (dbi_result_next_row(dbires)) { - n_id1 = my_dbi_result_get_idval_idx(dbires, 1); + n_id1 = my_dbi_result_get_short_idval(dbires, "ID"); if (!n_id1) { error_count++; @@ -2358,5 +2359,5 @@ } - sprintf(sql_command, "SELECT SEPARATORS.ID FROM SEPARATORS, POSITIONS WHERE POSITIONS.SEPARATORID=SEPARATORS.ID AND POSITIONS.REFSTYLEID="ULLSPEC, (unsigned long long)n_id1); + sprintf(sql_command, "SELECT SEPARATORS.ID FROM SEPARATORS, POSITIONS WHERE POSITIONS.SEPARATORID=SEPARATORS.ID AND POSITIONS.REFSTYLEID=%u", n_id1); dbires1 = dbi_conn_query(conn, sql_command); LOG_PRINT(LOG_DEBUG, sql_command); @@ -2375,5 +2376,5 @@ } - sprintf(sql_command, "DELETE FROM SEPARATORS WHERE ID="ULLSPEC, (unsigned long long)n_id2); + sprintf(sql_command, "DELETE FROM SEPARATORS WHERE ID=%u", n_id2); dbires2 = dbi_conn_query(conn, sql_command); LOG_PRINT(LOG_DEBUG, sql_command); @@ -2386,5 +2387,5 @@ } - sprintf(sql_command, "DELETE FROM POSITIONS WHERE REFSTYLEID="ULLSPEC, (unsigned long long)n_id1); + sprintf(sql_command, "DELETE FROM POSITIONS WHERE REFSTYLEID=%u", n_id1); ... [truncated message content] |
1 message has been excluded from this view by a project administrator.
