refdb-cvs Mailing List for RefDB (Page 42)
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-11-12 21:35:07
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18068 Modified Files: emacs.html Log Message: updated refdb-mode to 1.17 Index: emacs.html =================================================================== RCS file: /cvsroot/refdb/homepage/emacs.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -U2 -r1.6 -r1.7 --- emacs.html 12 Nov 2005 20:51:38 -0000 1.6 +++ emacs.html 12 Nov 2005 21:34:55 -0000 1.7 @@ -161,5 +161,5 @@ <h2 id="refdbmode">Emacs refdb-mode</h2> <p class="authors">Current Author: Markus Hoenicka <mho...@us...></p> - <p><strong><a href="addons/refdb-mode.el">Download refdb-mode.el (1.15)</a></strong></p> + <p><strong><a href="addons/refdb-mode.el">Download refdb-mode.el (1.17)</a></strong></p> <p>This minor mode for <a href="http://directory.fsf.org/emacs.html">Emacs</a> and <a href="http://www.xemacs.org/">XEmacs</a> is a frontend, and then some, for RefDB.</p> <ul> @@ -183,5 +183,5 @@ <p>In order to see refdb-mode in action, please see the following Flash demos. They will open in a separate browser window (if nothing happens, your browser suppresses popups. Right-click the link and select "Open in new tab"). A Flash 5 plugin is required to view the demos. If you can't view the demos, please refer to the screenshots below.</p> <p><a href="screenshots/demo1.html" target="_blank">Reference management</a> (1400kB)</p> - <p><a href="screenshots/document2.html" target="_blank">Creating citations and bibliographies</a> (782kB)</p> + <p><a href="screenshots/document2.html" target="_blank">Creating citations and bibliographies</a> (1100kB)</p> <h3 id="refdbmode-getref">Retrieving references</h3> <p class="legend"><img alt="Emacs refdb-mode" src="screenshots/refdb-mode-getref1.png"/></p> |
|
From: Markus H. <mho...@us...> - 2005-11-12 21:25:35
|
Update of /cvsroot/refdb/elisp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16265 Modified Files: refdb-mode.el Log Message: removed -f stdin default option as the clients no longer need it;moved to applications customize section;use full citation format by default;moved cite-references submenu to document section;various comment fixes Index: refdb-mode.el =================================================================== RCS file: /cvsroot/refdb/elisp/refdb-mode.el,v retrieving revision 1.16 retrieving revision 1.17 diff -u -U2 -r1.16 -r1.17 --- refdb-mode.el 8 Aug 2005 23:26:31 -0000 1.16 +++ refdb-mode.el 12 Nov 2005 21:25:27 -0000 1.17 @@ -115,4 +115,14 @@ ;; to talk to your refdbd server. ;; +;; 5. When working with RIS datasets, it is strongly recommended to use +;; "Transient mark mode". Adding and updating RIS datasets works on +;; the current region if a region is defined, otherwise on the whole +;; buffer. Transient mark mode highlights the current region if there +;; is one. To use transient mark mode, either use the menu command +;; Options->Active Region Highlighting (Transient Mark mode) on demand, +;; or add the following to your ~/.emacs to enable it by default: +;; +;; (transient-mark-mode t) +;; ;; After you restart Emacs, to enter RefDB minor mode at any time, ;; either: @@ -588,15 +598,15 @@ (defcustom refdb-refdbd-program "refdbd" - "File name of the refdbd executable." + "Command to run the refdbd executable." :type 'string :group 'refdb-programs) (defcustom refdb-refdbd-script "refdbctl" - "File name of the control script used to start and stop refdbd." + "Command to run the control script used to start and stop refdbd." :type 'string :group 'refdb-programs) (defcustom refdb-refdbc-program "refdbc" - "File name of the refdbc executable." + "Command to run the refdbc executable." :type 'string :group 'refdb-programs) @@ -609,5 +619,5 @@ (defcustom refdb-refdba-program "refdba" - "File name of the refdba executable." + "Command to run the refdba executable." :type 'string :group 'refdb-programs) @@ -620,25 +630,25 @@ (defcustom refdb-refdbnd-program "refdbnd" - "File name of the refdbnd shell script." + "Command to run the refdbnd shell script." :type 'string :group 'refdb-programs) (defcustom refdb-gnumake-program "make" - "File name of the GNU make utility. On systems using their own + "Command to run the GNU make utility. On systems using their own version of make the executable is often called 'gmake'." :type 'string :group 'refdb-external-programs) -(defcustom refdb-addref-options "-f stdin" +(defcustom refdb-addref-options "" "Options included when running the 'refdbc -C addref' command." :type 'string :group 'refdb-programs) -(defcustom refdb-updateref-options "-f stdin" +(defcustom refdb-updateref-options "" "Options included when running the 'refdbc -C updateref' command." :type 'string :group 'refdb-programs) -(defcustom refdb-deleteref-options "-f stdin" +(defcustom refdb-deleteref-options "" "Options included when running the 'refdbc -C deleteref' command." :type 'string @@ -650,20 +660,20 @@ :group 'refdb-programs) -(defcustom refdb-addnote-options "-f stdin" +(defcustom refdb-addnote-options "" "Options included when running the 'refdbc -C addnote' command." :type 'string :group 'refdb-programs) -(defcustom refdb-updatenote-options "-f stdin" +(defcustom refdb-updatenote-options "" "Options included when running the 'refdbc -C updatenote' command." :type 'string :group 'refdb-programs) -(defcustom refdb-deletenote-options "-f stdin" +(defcustom refdb-deletenote-options "" "Options included when running the 'refdbc -C deletenote' command." :type 'string :group 'refdb-programs) -(defcustom refdb-addstyle-options "-f stdin" +(defcustom refdb-addstyle-options "" "Options included when running the 'refdba -C addstyle' command." :type 'string @@ -3770,5 +3780,5 @@ (defun refdb-deletelink () - "Add links from extended notes to database objects." + "Delete links from extended notes to database objects." (interactive) ;; todo loop over target spec and value pairs until empty input @@ -6081,5 +6091,5 @@ (defgroup refdb nil "RefDB menu." - :group 'help + :group 'applications :link '(emacs-commentary-link "refdb-mode.el") :link '(url-link "http://refdb.sf.net/") @@ -6214,5 +6224,5 @@ ) -(defcustom refdb-citation-type 'short +(defcustom refdb-citation-type 'full "*Specifies the default citation type." :type '(choice (const :tag "Short " short) @@ -6571,5 +6581,4 @@ refdb-dumpref-menu-item refdb-convert-submenu-definition - refdb-cite-references-submenu-definition refdb-menu-item-separator4 refdb-addnote-menu-item @@ -6586,4 +6595,5 @@ refdb-menu-item-separator4 refdb-create-document-submenu-definition + refdb-cite-references-submenu-definition refdb-transform-submenu-definition refdb-view-output-submenu-definition |
|
From: Markus H. <mho...@us...> - 2005-11-12 20:51:46
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10280 Modified Files: emacs.html Log Message: updated demo Index: emacs.html =================================================================== RCS file: /cvsroot/refdb/homepage/emacs.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -U2 -r1.5 -r1.6 --- emacs.html 23 Oct 2005 21:06:30 -0000 1.5 +++ emacs.html 12 Nov 2005 20:51:38 -0000 1.6 @@ -183,5 +183,5 @@ <p>In order to see refdb-mode in action, please see the following Flash demos. They will open in a separate browser window (if nothing happens, your browser suppresses popups. Right-click the link and select "Open in new tab"). A Flash 5 plugin is required to view the demos. If you can't view the demos, please refer to the screenshots below.</p> <p><a href="screenshots/demo1.html" target="_blank">Reference management</a> (1400kB)</p> - <p><a href="screenshots/document1.html" target="_blank">Creating citations and bibliographies</a> (782kB)</p> + <p><a href="screenshots/document2.html" target="_blank">Creating citations and bibliographies</a> (782kB)</p> <h3 id="refdbmode-getref">Retrieving references</h3> <p class="legend"><img alt="Emacs refdb-mode" src="screenshots/refdb-mode-getref1.png"/></p> |
|
From: Markus H. <mho...@us...> - 2005-11-08 21:40:04
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5493 Modified Files: Tag: Release_0_9_5_stable backend-html.c backend-ris.c backend.c backendn-html.c backendn-scrn.c cgi.c dbfncs.c linklist.c refdbd.c refdbxp.c Log Message: fixed gcc4 warnings Index: backend-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v retrieving revision 1.27.2.7 retrieving revision 1.27.2.8 diff -u -U2 -r1.27.2.7 -r1.27.2.8 --- backend-html.c 3 Nov 2005 20:40:19 -0000 1.27.2.7 +++ backend-html.c 8 Nov 2005 21:39:50 -0000 1.27.2.8 @@ -22,4 +22,5 @@ #include <string.h> #include <syslog.h> /* for definitions of log message priorities */ +#include <stdio.h> #include <dbi/dbi.h> Index: backend-ris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-ris.c,v retrieving revision 1.14.2.6 retrieving revision 1.14.2.7 diff -u -U2 -r1.14.2.6 -r1.14.2.7 --- backend-ris.c 3 Nov 2005 20:40:19 -0000 1.14.2.6 +++ backend-ris.c 8 Nov 2005 21:39:50 -0000 1.14.2.7 @@ -22,4 +22,5 @@ #include <string.h> #include <syslog.h> /* for definitions of log message priorities */ +#include <stdio.h> #include <dbi/dbi.h> Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.27.2.13 retrieving revision 1.27.2.14 diff -u -U2 -r1.27.2.13 -r1.27.2.14 --- backend.c 3 Nov 2005 20:40:19 -0000 1.27.2.13 +++ backend.c 8 Nov 2005 21:39:50 -0000 1.27.2.14 @@ -22,6 +22,7 @@ #include <stdlib.h> #include <string.h> -#include <dbi/dbi.h> +#include <stdio.h> #include <syslog.h> +#include <dbi/dbi.h> #include "refdb.h" @@ -2217,5 +2218,5 @@ /* binary strings are returned without a terminating \0 so we have to bend over backwards to treat it as a normal string */ - result = dbi_result_get_binary(dbires, fieldname); + result = (const char*)dbi_result_get_binary(dbires, fieldname); if (!result || dbi_conn_error_flag(dbi_result_get_conn(dbires))) { return NULL; @@ -2275,5 +2276,5 @@ /* binary strings are returned without a terminating \0 so we have to bend over backwards to treat it as a normal string */ - result = dbi_result_get_binary_idx(dbires, idx); + result = (const char*)dbi_result_get_binary_idx(dbires, idx); if (!result || dbi_conn_error_flag(dbi_result_get_conn(dbires))) { return NULL; @@ -2336,5 +2337,5 @@ conn = dbi_result_get_conn(Result); - result = dbi_result_get_binary(Result, fieldname); + result = (const char*)dbi_result_get_binary(Result, fieldname); if (dbi_conn_error_flag(conn)) { @@ -2383,5 +2384,5 @@ /* this implementation assumes that binary strings are returned by the mysql driver including a trailing \0 */ - result = dbi_result_get_binary(Result, fieldname); + result = (const char*)dbi_result_get_binary(Result, fieldname); if (!result && dbi_conn_error_flag(dbi_result_get_conn(Result))) { return NULL; @@ -2432,5 +2433,5 @@ /* this implementation assumes that binary strings are returned by the mysql driver including a trailing \0 */ - result = dbi_result_get_binary_idx(Result, idx); + result = (const char*)dbi_result_get_binary_idx(Result, idx); if (!result || dbi_conn_error_flag(dbi_result_get_conn(Result))) { return NULL; Index: backendn-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-html.c,v retrieving revision 1.6.2.5 retrieving revision 1.6.2.6 diff -u -U2 -r1.6.2.5 -r1.6.2.6 --- backendn-html.c 3 Nov 2005 20:40:19 -0000 1.6.2.5 +++ backendn-html.c 8 Nov 2005 21:39:50 -0000 1.6.2.6 @@ -21,4 +21,5 @@ #include <string.h> +#include <stdio.h> #include <syslog.h> /* for definitions of log message priorities */ #include <time.h> Index: backendn-scrn.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-scrn.c,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -U2 -r1.3.2.4 -r1.3.2.5 --- backendn-scrn.c 3 Nov 2005 20:40:19 -0000 1.3.2.4 +++ backendn-scrn.c 8 Nov 2005 21:39:50 -0000 1.3.2.5 @@ -21,4 +21,5 @@ #include <string.h> +#include <stdio.h> #include <syslog.h> /* for definitions of log message priorities */ #include <time.h> Index: cgi.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/cgi.c,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -U2 -r1.6 -r1.6.2.1 --- cgi.c 19 Apr 2003 16:17:26 -0000 1.6 +++ cgi.c 8 Nov 2005 21:39:50 -0000 1.6.2.1 @@ -22,4 +22,5 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include <fcntl.h> #include <limits.h> Index: dbfncs.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/dbfncs.c,v retrieving revision 1.15.2.15 retrieving revision 1.15.2.16 diff -u -U2 -r1.15.2.15 -r1.15.2.16 --- dbfncs.c 21 Sep 2005 23:29:24 -0000 1.15.2.15 +++ dbfncs.c 8 Nov 2005 21:39:50 -0000 1.15.2.16 @@ -22,4 +22,6 @@ #include <dbi/dbi.h> #include <syslog.h> +#include <string.h> +#include <stdio.h> #include "linklist.h" Index: linklist.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/linklist.c,v retrieving revision 1.9.2.4 retrieving revision 1.9.2.5 diff -u -U2 -r1.9.2.4 -r1.9.2.5 --- linklist.c 28 Oct 2005 23:47:33 -0000 1.9.2.4 +++ linklist.c 8 Nov 2005 21:39:50 -0000 1.9.2.5 @@ -22,4 +22,6 @@ #include <stdio.h> /* for a definition of NULL */ #include <stdlib.h> /* for malloc */ +#include <string.h> + #include "linklist.h" Index: refdbd.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v retrieving revision 1.74.2.20 retrieving revision 1.74.2.21 diff -u -U2 -r1.74.2.20 -r1.74.2.21 --- refdbd.c 3 Nov 2005 20:40:19 -0000 1.74.2.20 +++ refdbd.c 8 Nov 2005 21:39:50 -0000 1.74.2.21 @@ -156,9 +156,10 @@ int main(int argc, char** argv) { int server_sockfd, client_sockfd; /* sockets used for client/server dialog */ - int server_len, client_len; + int server_len; int i, j, n_opt; /* flags, result, */ int n_pipe_buf = 512; /* maximum size of atomic write to fifo. 512 is the posix value. if the OS defines a larger value, this will be used below */ int num_drivers = 0; /* number of libdbi drivers */ int n_have_requested_driver = 0; /* used to check the libdbi drivers */ + socklen_t client_len; struct sockaddr_in server_address; struct sockaddr_in client_address; Index: refdbxp.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbxp.c,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -U2 -r1.7.2.4 -r1.7.2.5 --- refdbxp.c 29 Jul 2005 21:15:42 -0000 1.7.2.4 +++ refdbxp.c 8 Nov 2005 21:39:50 -0000 1.7.2.5 @@ -27,4 +27,5 @@ */ +#include <stdlib.h> #include <stdio.h> #include <string.h> |
|
From: Markus H. <mho...@us...> - 2005-11-06 21:35:18
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6859 Modified Files: doc.html Log Message: changed rnc files to rng Index: doc.html =================================================================== RCS file: /cvsroot/refdb/homepage/doc.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -U2 -r1.11 -r1.12 --- doc.html 6 Nov 2005 20:50:48 -0000 1.11 +++ doc.html 6 Nov 2005 21:35:06 -0000 1.12 @@ -2,5 +2,5 @@ <html xmlns="http://www.w3.org/1999/xhtml"> - <!-- $Id --> + <!-- $Id$ --> <head> @@ -209,9 +209,9 @@ <h2 id="dtd">DTD and Relax NG schema files</h2> <p>RefDB uses four document type definitions (DTD) in addition to the DTDs of the supported SGML and XML documents. The <code>citationlistx.dtd</code> defines a document type that encodes the RefDB citation information in a SGML or XML document. The <code>citestylex.dtd</code> defines a document type that holds the style and formatting information for a specific publisher. The <code>risx.dtd</code> defines a document type to author bibliographic records. The <code>xnote.dtd</code> defines a document type to write extended notes. All DTDs can be viewed online. The URLs below can be used as the system identifier in your document's type declaration. They will always point to the most recent release of the DTDs (see the DTD files for how to use a particular release).</p> - <p>The DTDs are also available as <a href="http://www.relaxng.org">Relax NG</a> schemas using the compact notation.</p> - <p><a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd">http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.rnc">citationlistx.rnc</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd">http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.rnc">citestylex.rnc</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/risx/risx.dtd">http://refdb.sourceforge.net/dtd/risx/risx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/risx/risx.rnc">risx.rnc</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/xnote/xnote.dtd">http://refdb.sourceforge.net/dtd/xnote/xnote.dtd</a> <a href="http://refdb.sourceforge.net/dtd/xnote/xnote.rnc">xnote.rnc</a></p> + <p>The DTDs are also available as <a href="http://www.relaxng.org">Relax NG</a> schemas using the XML notation.</p> + <p><a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd">http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.rng">citationlistx.rng</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd">http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.rng">citestylex.rng</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/risx/risx.dtd">http://refdb.sourceforge.net/dtd/risx/risx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/risx/risx.rng">risx.rng</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/xnote/xnote.dtd">http://refdb.sourceforge.net/dtd/xnote/xnote.dtd</a> <a href="http://refdb.sourceforge.net/dtd/xnote/xnote.rng">xnote.rng</a></p> </div> |
|
From: Markus H. <mho...@us...> - 2005-11-06 20:50:58
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28493 Modified Files: doc.html Log Message: added rnc files Index: doc.html =================================================================== RCS file: /cvsroot/refdb/homepage/doc.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -U2 -r1.10 -r1.11 --- doc.html 22 Oct 2005 21:39:04 -0000 1.10 +++ doc.html 6 Nov 2005 20:50:48 -0000 1.11 @@ -147,5 +147,5 @@ </tr> <tr> - <td class="localnav"><a href="#dtd">The DTD files</a></td> + <td class="localnav"><a href="#dtd">The DTD and Relax NG schema files</a></td> </tr> </tbody> @@ -207,10 +207,11 @@ </ul> - <h2 id="dtd">DTD files</h2> + <h2 id="dtd">DTD and Relax NG schema files</h2> <p>RefDB uses four document type definitions (DTD) in addition to the DTDs of the supported SGML and XML documents. The <code>citationlistx.dtd</code> defines a document type that encodes the RefDB citation information in a SGML or XML document. The <code>citestylex.dtd</code> defines a document type that holds the style and formatting information for a specific publisher. The <code>risx.dtd</code> defines a document type to author bibliographic records. The <code>xnote.dtd</code> defines a document type to write extended notes. All DTDs can be viewed online. The URLs below can be used as the system identifier in your document's type declaration. They will always point to the most recent release of the DTDs (see the DTD files for how to use a particular release).</p> - <p><a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd">http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd">http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/risx/risx.dtd">http://refdb.sourceforge.net/dtd/risx/risx.dtd</a></p> - <p><a href="http://refdb.sourceforge.net/dtd/xnote/xnote.dtd">http://refdb.sourceforge.net/dtd/xnote/xnote.dtd</a></p> + <p>The DTDs are also available as <a href="http://www.relaxng.org">Relax NG</a> schemas using the compact notation.</p> + <p><a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd">http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citationlistx/citationlistx.rnc">citationlistx.rnc</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd">http://refdb.sourceforge.net/dtd/citestylex/citestylex.dtd</a> <a href="http://refdb.sourceforge.net/dtd/citestylex/citestylex.rnc">citestylex.rnc</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/risx/risx.dtd">http://refdb.sourceforge.net/dtd/risx/risx.dtd</a> <a href="http://refdb.sourceforge.net/dtd/risx/risx.rnc">risx.rnc</a></p> + <p><a href="http://refdb.sourceforge.net/dtd/xnote/xnote.dtd">http://refdb.sourceforge.net/dtd/xnote/xnote.dtd</a> <a href="http://refdb.sourceforge.net/dtd/xnote/xnote.rnc">xnote.rnc</a></p> </div> |
|
From: Markus H. <mho...@us...> - 2005-11-05 23:51:44
|
Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21593/xsl/refdb/tei-refdb-xsl/tei-fo Modified Files: Tag: Release_0_9_5_stable tei-refdb-fo.xsl.in Log Message: fixed paths to original stylesheets Index: tei-refdb-fo.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-fo/tei-refdb-fo.xsl.in,v retrieving revision 1.2.2.5 retrieving revision 1.2.2.6 diff -u -U2 -r1.2.2.5 -r1.2.2.6 --- tei-refdb-fo.xsl.in 27 Nov 2004 23:21:32 -0000 1.2.2.5 +++ tei-refdb-fo.xsl.in 5 Nov 2005 23:51:31 -0000 1.2.2.6 @@ -14,5 +14,5 @@ <!-- the original TEI stylesheets for FO --> -<xsl:import href="<!--tei_xsl-->/P4/fo/tei.xsl"/> +<xsl:import href="<!--tei_xsl-->/p4/fo/tei.xsl"/> <!-- common variables --> |
|
From: Markus H. <mho...@us...> - 2005-11-05 23:51:44
|
Update of /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21593/xsl/refdb/tei-refdb-xsl/tei-html Modified Files: Tag: Release_0_9_5_stable tei-refdb-html.xsl.in Log Message: fixed paths to original stylesheets Index: tei-refdb-html.xsl.in =================================================================== RCS file: /cvsroot/refdb/refdb/xsl/refdb/tei-refdb-xsl/tei-html/tei-refdb-html.xsl.in,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -U2 -r1.2.2.3 -r1.2.2.4 --- tei-refdb-html.xsl.in 27 Nov 2004 23:23:06 -0000 1.2.2.3 +++ tei-refdb-html.xsl.in 5 Nov 2005 23:51:31 -0000 1.2.2.4 @@ -12,5 +12,5 @@ <!-- the original TEI stylesheets for HTML --> -<xsl:import href="<!--tei_xsl-->/P4/html/teihtml.xsl"/> +<xsl:import href="<!--tei_xsl-->/p4/html/tei.xsl"/> <!-- common variables --> |
|
From: Markus H. <mho...@us...> - 2005-11-05 23:50:43
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21218/src Modified Files: Tag: Release_0_9_5_stable refdba.c Log Message: fixed adduser/deleteuser help message Index: refdba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdba.c,v retrieving revision 1.45.2.8 retrieving revision 1.45.2.9 diff -u -U2 -r1.45.2.8 -r1.45.2.9 --- refdba.c 28 Oct 2005 23:53:55 -0000 1.45.2.8 +++ refdba.c 5 Nov 2005 23:50:35 -0000 1.45.2.9 @@ -904,5 +904,5 @@ } else { - printf("Grants access rights to a database for the given users\nSyntax: adduser {-d database} [-h] {-H hostname} [-r] [-N password] {user|-f infile}\nOptions: -d database specify the database\n -f infile Read the names of the users from file infile\n -h prints this mini-help\n -H hostname specify the hostname of the server that runs refdbd through which the users will connect\n -N new password for given user\n All other arguments are interpreted as usernames.\n"); + printf("Grants access rights to a database for the given users\nSyntax: adduser {-d database} [-h] {-H hostname} [-N password] {user|-f infile}\nOptions: -d database specify the database\n -f infile Read the names of the users from file infile\n -h prints this mini-help\n -H hostname specify the hostname of the server that runs refdbd through which the users will connect\n -N new password for given user\n All other arguments are interpreted as usernames.\n"); } n_just_help++; |
|
From: Markus H. <mho...@us...> - 2005-11-05 23:49:31
|
Update of /cvsroot/refdb/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20806 Modified Files: Tag: Release_0_9_5_stable configure.in Log Message: fixed path of TEI stylesheets Index: configure.in =================================================================== RCS file: /cvsroot/refdb/refdb/configure.in,v retrieving revision 1.49.2.23 retrieving revision 1.49.2.24 diff -u -U2 -r1.49.2.23 -r1.49.2.24 --- configure.in 2 Nov 2005 22:56:33 -0000 1.49.2.23 +++ configure.in 5 Nov 2005 23:49:20 -0000 1.49.2.24 @@ -355,8 +355,8 @@ fi]) -AC_CHECK_FILE($tei_xsl/P4/fo/tei.xsl, +AC_CHECK_FILE($tei_xsl/p4/fo/tei.xsl, [echo "TEI XSL stylesheets found"], [if test -n "$myxmlcatalog"; then -REFDB_XML_FILE($myxmlcatalog,${tei_xsl}/P4/fo/tei.xsl) +REFDB_XML_FILE($myxmlcatalog,${tei_xsl}/p4/fo/tei.xsl) else echo "cannot locate TEI XSL stylesheets via XML catalog" |
|
From: Markus H. <mho...@us...> - 2005-11-03 20:49:31
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17111 Modified Files: Tag: Release_0_9_5_stable refdbc.c Log Message: commented out leftover debug printf call Index: refdbc.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbc.c,v retrieving revision 1.72.2.13 retrieving revision 1.72.2.14 diff -u -U2 -r1.72.2.13 -r1.72.2.14 --- refdbc.c 28 Oct 2005 23:53:55 -0000 1.72.2.13 +++ refdbc.c 3 Nov 2005 20:49:22 -0000 1.72.2.14 @@ -3261,5 +3261,5 @@ /* runs phases 1 through 4 of communication protocol */ if (!strcmp(my_reftype, "ris")) { - printf("call send_ris_data()\n"); +/* printf("call send_ris_data()\n"); */ n_send_result = send_ris_data(infp, pagerfp, errstream, n_sockfd, &ris_set_buffer, &n_setlength, &n_setcount, default_ris, n_cgi, &byte_written); } |
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13883 Modified Files: Tag: Release_0_9_5_stable backend-bibtex.c backend-db31.c backend-dbib.c backend-dbiba.c backend-html.c backend-ris.c backend-risx.c backend-scrn.c backend-teix.c backend.c backendn-html.c backendn-notex.c backendn-scrn.c noteshandler.c refdb.h refdbd.c refdbda.c refdbdbib.c refdbdnote.c refdbdref.c refdbib.c risdb.c risxhandler.c xmlhandler.c xmlhelper.c xmlout.c Log Message: removed BSTRING, replaced all occurrences with get_status_msg() calls Index: backend-bibtex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-bibtex.c,v retrieving revision 1.16.2.6 retrieving revision 1.16.2.7 diff -u -U2 -r1.16.2.6 -r1.16.2.7 --- backend-bibtex.c 11 Sep 2005 19:55:11 -0000 1.16.2.6 +++ backend-bibtex.c 3 Nov 2005 20:40:19 -0000 1.16.2.7 @@ -37,12 +37,4 @@ /* some globals */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; - -/* extern char server_ip[]; */ /* the IP address of the database server */ extern int n_log_level; /* numeric version of log_level */ Index: backend-db31.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-db31.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-db31.c 8 Aug 2005 00:09:20 -0000 1.16.2.5 +++ backend-db31.c 3 Nov 2005 20:40:19 -0000 1.16.2.6 @@ -35,5 +35,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend-dbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v retrieving revision 1.28.2.11 retrieving revision 1.28.2.12 diff -u -U2 -r1.28.2.11 -r1.28.2.12 --- backend-dbib.c 2 Oct 2005 23:38:14 -0000 1.28.2.11 +++ backend-dbib.c 3 Nov 2005 20:40:19 -0000 1.28.2.12 @@ -40,6 +40,4 @@ extern int n_log_level; extern dbi_result dbi_style_res; -extern struct BSTRING outomem; -extern struct BSTRING connerr; /* forward declarations of local functions */ Index: backend-dbiba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-dbiba.c,v retrieving revision 1.26.2.15 retrieving revision 1.26.2.16 diff -u -U2 -r1.26.2.15 -r1.26.2.16 --- backend-dbiba.c 2 Oct 2005 23:38:15 -0000 1.26.2.15 +++ backend-dbiba.c 3 Nov 2005 20:40:19 -0000 1.26.2.16 @@ -41,5 +41,4 @@ extern int n_log_level; -extern struct BSTRING outomem; /* forward declarations of local functions */ @@ -1090,5 +1089,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1096,5 +1095,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1108,5 +1107,5 @@ if ((new_ref = mstrcat(*ptr_ref, starttag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1119,5 +1118,5 @@ if (item_dateother && *item_dateother && !dbi_conn_error_flag(ptr_bibconns->conn_source)) { if (sgml_entitize(&item_dateother, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_dateother); return NULL; @@ -1168,5 +1167,5 @@ if (item_firstsep && *item_firstsep && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item_firstsep, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_firstsep); return NULL; @@ -1187,5 +1186,5 @@ if (item_secondsep && *item_secondsep && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item_secondsep, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_secondsep); return NULL; @@ -1219,5 +1218,5 @@ all we "have", the whole element should be omitted */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1243,5 +1242,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1266,5 +1265,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1290,5 +1289,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1312,5 +1311,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1333,5 +1332,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1358,5 +1357,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1380,5 +1379,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1401,5 +1400,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1423,5 +1422,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1435,5 +1434,5 @@ if (item_firstsep && *item_firstsep) { if ((new_ref = mstrcat(*ptr_ref, item_firstsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1459,5 +1458,5 @@ if (item_secondsep && *item_secondsep) { if ((new_ref = mstrcat(*ptr_ref, item_secondsep, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1485,5 +1484,5 @@ sprintf(year_buffer, "%d", n_pubyear); if ((new_ref = mstrcat(*ptr_ref, year_buffer, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1496,5 +1495,5 @@ /* insert dummy pubdate */ if ((new_ref = mstrcat(*ptr_ref, dummy_year, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -1508,5 +1507,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pubdate>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1518,5 +1517,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1524,5 +1523,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1695,5 +1694,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(real_item_title); @@ -1702,5 +1701,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(real_item_title); @@ -1718,5 +1717,5 @@ if (n_title_as_author) { if ((new_ref = mstrcat(*ptr_ref, "<title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1728,5 +1727,5 @@ else { if ((new_ref = mstrcat(*ptr_ref, "<title role=\"", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1737,5 +1736,5 @@ if ((new_ref = mstrcat(*ptr_ref, role, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1746,5 +1745,5 @@ if ((new_ref = mstrcat(*ptr_ref, "\">", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1767,5 +1766,5 @@ if (sgml_entitize(&real_item_title, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1773,5 +1772,5 @@ if ((new_ref = mstrcat(*ptr_ref, real_item_title, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(real_item_title); return NULL; @@ -1785,5 +1784,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1795,5 +1794,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -1884,5 +1883,5 @@ if (preceeding && *preceeding && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&preceeding, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(preceeding); return NULL; @@ -1893,5 +1892,5 @@ if (following && *following && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&following, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(following); if (preceeding) { @@ -1916,5 +1915,5 @@ if (preceeding) { if ((new_ref = mstrcat(*ptr_ref, preceeding, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(preceeding); if (following) { @@ -2006,5 +2005,5 @@ if (following) { if ((new_ref = mstrcat(*ptr_ref, following, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(following); if (preceeding) { @@ -2149,5 +2148,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -2156,5 +2155,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { free(item); - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2169,5 +2168,5 @@ if (n_intext != 3) { if ((new_ref = mstrcat(*ptr_ref, "<title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2180,5 +2179,5 @@ mod_periodical = malloc(strlen(periodical)+2); /* extra spaces */ if (!mod_periodical) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2229,5 +2228,5 @@ if ((new_ref = mstrcat(*ptr_ref, mod_periodical, ptr_ref_len, 0)) == NULL) { free(mod_periodical); - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2239,5 +2238,5 @@ if (n_intext != 3) { if ((new_ref = mstrcat(*ptr_ref, "</title>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2250,5 +2249,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); return NULL; @@ -2256,5 +2255,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -2322,5 +2321,5 @@ if (sgml_entitize(&item_simple, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2359,5 +2358,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2366,5 +2365,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2380,5 +2379,5 @@ if ((new_ref = mstrcat(*ptr_ref, start_tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2389,5 +2388,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_simple, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2398,5 +2397,5 @@ if ((new_ref = mstrcat(*ptr_ref, end_tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_simple); return NULL; @@ -2409,5 +2408,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2416,5 +2415,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_simple); @@ -2512,5 +2511,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2519,5 +2518,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2539,5 +2538,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2546,5 +2545,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2560,5 +2559,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2569,5 +2568,5 @@ if (sgml_entitize(&item_sp, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2575,5 +2574,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_sp, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2584,5 +2583,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2595,5 +2594,5 @@ if (item && *item & !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2602,5 +2601,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2620,5 +2619,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2627,5 +2626,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2641,5 +2640,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2650,5 +2649,5 @@ if (sgml_entitize(&item_sp, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2667,5 +2666,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2674,5 +2673,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2685,5 +2684,5 @@ else { if ((new_ref = mstrcat(*ptr_ref, "-", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2706,5 +2705,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</pagenums>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); delete_all_lilimem(&sentinel); return NULL; @@ -2717,5 +2716,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2724,5 +2723,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2742,5 +2741,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2749,5 +2748,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); delete_all_lilimem(&sentinel); @@ -2816,5 +2815,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* preceeding */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2823,5 +2822,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2837,5 +2836,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<bibliomset role=\"notes\">", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2846,5 +2845,5 @@ if (sgml_entitize(&item_notes, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2852,5 +2851,5 @@ if ((new_ref = mstrcat(*ptr_ref, item_notes, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2861,5 +2860,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</bibliomset>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item_notes); return NULL; @@ -2872,5 +2871,5 @@ if (item && *item && !dbi_conn_error_flag(ptr_bibconns->conn_refdb)) { /* following */ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2879,5 +2878,5 @@ if ((new_ref = mstrcat(*ptr_ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); free(item_notes); @@ -2963,5 +2962,5 @@ if (sgml_entitize(&item, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(item); dbi_result_free(dbires_sep); @@ -2969,5 +2968,5 @@ } if ((new_ref = mstrcat(ref, item, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); dbi_result_free(dbires_sep); free(item); @@ -3318,5 +3317,5 @@ if (strcmp(dayformat, "ARABICDAY") == 0) { if ((new_ref = mstrcat(ref, the_day, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3327,5 +3326,5 @@ else if (strcmp(dayformat, "ROMANDAY") == 0) { if ((new_ref = mstrcat(ref, romanday[n_day-1], ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3858,5 +3857,5 @@ if ((new_ref = mstrcat(*ptr_ref, tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3866,10 +3865,10 @@ if ((entitize_buf = mstrdup(lastname)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3877,5 +3876,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3887,5 +3886,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</surname>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3940,5 +3939,5 @@ if ((new_ref = mstrcat(*ptr_ref, tag, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3948,5 +3947,5 @@ if ((entitize_buf = mstrdup(ptr_ainfo->firstname)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3963,5 +3962,5 @@ if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3969,5 +3968,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -3981,5 +3980,5 @@ strcmp(initialstyle, "F.M.") == 0)) { if ((new_ref = mstrcat(*ptr_ref, ".", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -3990,5 +3989,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</firstname>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4007,5 +4006,5 @@ strcmp(initialstyle, "FSPCM") == 0)) { if ((new_ref = mstrcat(*ptr_ref, " ", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4016,5 +4015,5 @@ if ((new_ref = mstrcat(*ptr_ref, "<othername>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4024,5 +4023,5 @@ if ((entitize_buf = mstrdup(item)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4044,5 +4043,5 @@ if (sgml_entitize(&entitize_buf, NULL) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -4050,5 +4049,5 @@ if ((new_ref = mstrcat(*ptr_ref, entitize_buf, ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(entitize_buf); return NULL; @@ -4063,5 +4062,5 @@ strcmp(initialstyle, "FIRSTSPCM.") == 0)) { if ((new_ref = mstrcat(*ptr_ref, ".", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -4072,5 +4071,5 @@ if ((new_ref = mstrcat(*ptr_ref, "</othername>", ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } Index: backend-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-html.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-html.c 22 Sep 2005 21:40:08 -0000 1.27.2.6 +++ backend-html.c 3 Nov 2005 20:40:19 -0000 1.27.2.7 @@ -36,7 +36,4 @@ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -61,46 +58,15 @@ char* header; - n_cgi = (ptr_rendinfo->ref_format == REFCGIHTML) ? 1:0; - - /* write a header */ - if (n_cgi) { - html_head = load_html("refdbq_head", refdblib); - if (!html_head) { - LOG_PRINT(LOG_ERR, get_status_msg(802)); - return 802; - } - strcpy(*(ptr_rendinfo->ptr_ref), cgihead_html.text); - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), html_head, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - free(html_head); - - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<thead><tr><th class=\"result\">Matching References</th></tr>\n<tr><td class=\"result\"><input type=\"submit\" value=\"Delete selected references\" name=\"deleteref\"> <input type=\"submit\" value=\"Add selected references to Personal List\" name=\"pickref\"> <input type=\"submit\" value=\"Remove selected references from Personal List\" name=\"unpickref\"></td></tr></thead><tbody>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } + if ((header = assemble_header(ptr_rendinfo)) == NULL) { + return 801; } - else { /* not cgi */ - if ((header = assemble_header(ptr_rendinfo)) == NULL) { - return 801; - } - if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) { - free(header); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - free(header); - } + if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) { + free(header); + return 801; + } + else { + *(ptr_rendinfo->ptr_ref) = new_ref; + free(header); } Index: backend-ris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-ris.c,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -u -U2 -r1.14.2.5 -r1.14.2.6 --- backend-ris.c 7 Sep 2005 23:45:01 -0000 1.14.2.5 +++ backend-ris.c 3 Nov 2005 20:40:19 -0000 1.14.2.6 @@ -34,12 +34,6 @@ #include "connect.h" -/* extern char username[]; */ /* the database username */ -/* extern char passwd[]; */ /* database password */ -/* extern char current_db[]; */ /* current database */ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -64,35 +58,7 @@ char cgi_buffer[1024]; - n_cgi = (ptr_rendinfo->ref_format == 7) ? 1:0; + /* we just make sure that we start with a clean string */ + (*(ptr_rendinfo->ptr_ref))[0] = '\0'; - if (n_cgi) { - html_head = load_html("refdbq_head", refdblib); - if (!html_head) { - return 802; - } - strcpy(*(ptr_rendinfo->ptr_ref), cgihead_html.text); - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), html_head, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - free(html_head); - - if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "<thead><tr><th class=\"result\">Edit Reference</th></tr>\n<tr><td class=\"result\"><input type=\"submit\" value=\"Update\" name=\"updateref\"></td></tr></thead><tbody>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - free(html_head); - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - *(ptr_rendinfo->ptr_ref) = new_ref; - } - } - else { /* not cgi */ - /* we just make sure that we start with a clean string */ - (*(ptr_rendinfo->ptr_ref))[0] = '\0'; - } return 0; } @@ -358,5 +324,5 @@ && reprint.reprint != NULL && *(reprint.reprint)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nRP - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -365,5 +331,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.reprint, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -373,5 +339,5 @@ if (reprint.date != NULL && *(reprint.date)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), " (", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -380,5 +346,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.date, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -387,5 +353,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), ")", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -398,5 +364,5 @@ if (reprint.avail != NULL && *(reprint.avail)) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nAV - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -405,5 +371,5 @@ } if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), reprint.avail, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -528,5 +494,5 @@ if (!have_pubyear && strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nPY - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -537,5 +503,5 @@ if (have_pubyear || strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), (char*)item, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -548,5 +514,5 @@ /* add /// to make the date entry valid */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "///", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -572,5 +538,5 @@ if (!have_pubyear && strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nY2 - ", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -581,5 +547,5 @@ if (have_pubyear || strcmp(item, "///")) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), (char*)item, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -592,5 +558,5 @@ /* add /// to make the date entry valid */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "///", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -675,5 +641,5 @@ /* The End */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\nER - \n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } @@ -684,5 +650,5 @@ if (n_cgi) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</textarea></td></tr>", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backend-risx.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v retrieving revision 1.30.2.11 retrieving revision 1.30.2.12 diff -u -U2 -r1.30.2.11 -r1.30.2.12 --- backend-risx.c 23 Oct 2005 20:18:41 -0000 1.30.2.11 +++ backend-risx.c 3 Nov 2005 20:40:19 -0000 1.30.2.12 @@ -40,7 +40,4 @@ extern char refdblib[]; /* location of shareable files */ -extern struct BSTRING cgihead_html; -extern struct BSTRING cgihead_plain; -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -230,5 +227,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -358,5 +355,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -400,5 +397,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -455,5 +452,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -515,5 +512,5 @@ if (nhave_buffer_data) { if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer); return 801; @@ -747,5 +744,5 @@ buffer1_len = 4096; if ((buffer1 = malloc(buffer1_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -976,5 +973,5 @@ *ptr_nhave_buffer_data = 1; if ((new_ref = mstrcat(*ptr_buffer, buffer1, ptr_buffer_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer1); return NULL; @@ -1027,5 +1024,5 @@ buffer1_len = 4096; if ((buffer1 = malloc(buffer1_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } @@ -1151,5 +1148,5 @@ if (nhave_data) { if ((new_ref = mstrcat(*ptr_buffer, buffer1, ptr_buffer_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); free(buffer1); return NULL; Index: backend-scrn.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-scrn.c,v retrieving revision 1.17.2.5 retrieving revision 1.17.2.6 diff -u -U2 -r1.17.2.5 -r1.17.2.6 --- backend-scrn.c 22 Sep 2005 21:40:08 -0000 1.17.2.5 +++ backend-scrn.c 3 Nov 2005 20:40:19 -0000 1.17.2.6 @@ -39,5 +39,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend-teix.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend-teix.c,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -U2 -r1.7.2.3 -r1.7.2.4 --- backend-teix.c 29 Jul 2005 21:15:34 -0000 1.7.2.3 +++ backend-teix.c 3 Nov 2005 20:40:19 -0000 1.7.2.4 @@ -34,5 +34,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: backend.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backend.c,v retrieving revision 1.27.2.12 retrieving revision 1.27.2.13 diff -u -U2 -r1.27.2.12 -r1.27.2.13 --- backend.c 2 Oct 2005 23:38:16 -0000 1.27.2.12 +++ backend.c 3 Nov 2005 20:40:19 -0000 1.27.2.13 @@ -33,4 +33,5 @@ #include "risdb.h" #include "authorinfo.h" +#include "connect.h" /* globals */ @@ -38,5 +39,4 @@ extern int n_log_level; extern dbi_result dbi_style_res; -extern struct BSTRING outomem; /* this string array is used for author queries. MySQL uses an enum field, @@ -61,5 +61,5 @@ if ((header = malloc(header_len)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return NULL; } Index: backendn-html.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-html.c,v retrieving revision 1.6.2.4 retrieving revision 1.6.2.5 diff -u -U2 -r1.6.2.4 -r1.6.2.5 --- backendn-html.c 19 Sep 2005 20:10:29 -0000 1.6.2.4 +++ backendn-html.c 3 Nov 2005 20:40:19 -0000 1.6.2.5 @@ -32,5 +32,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -80,5 +79,5 @@ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</body>\n</html>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backendn-notex.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v retrieving revision 1.8.2.5 retrieving revision 1.8.2.6 diff -u -U2 -r1.8.2.5 -r1.8.2.6 --- backendn-notex.c 23 Sep 2005 23:48:34 -0000 1.8.2.5 +++ backendn-notex.c 3 Nov 2005 20:40:19 -0000 1.8.2.6 @@ -37,5 +37,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ @@ -333,5 +332,5 @@ /* finish with an empty line */ if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\n\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); return 801; } Index: backendn-scrn.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/backendn-scrn.c,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -U2 -r1.3.2.3 -r1.3.2.4 --- backendn-scrn.c 19 Sep 2005 20:10:29 -0000 1.3.2.3 +++ backendn-scrn.c 3 Nov 2005 20:40:19 -0000 1.3.2.4 @@ -32,5 +32,4 @@ /* some globals */ -extern struct BSTRING outomem; extern int n_log_level; /* numeric version of log_level */ Index: noteshandler.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v retrieving revision 1.18.2.11 retrieving revision 1.18.2.12 diff -u -U2 -r1.18.2.11 -r1.18.2.12 --- noteshandler.c 23 Sep 2005 23:49:44 -0000 1.18.2.11 +++ noteshandler.c 3 Nov 2005 20:40:19 -0000 1.18.2.12 @@ -41,10 +41,8 @@ #include "risdb.h" #include "dbfncs.h" +#include "connect.h" extern int n_log_level; extern int nongeek_offset; -extern struct BSTRING connerr; -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; /* forward declaration of local functions */ @@ -477,5 +475,5 @@ /* sprintf(sql_command, "try to add set as note "ULLSPEC"\n", (unsigned long long)(ptr_andata->n_note_id)); */ /* if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { */ -/* LOG_PRINT(LOG_WARNING, outomem.text); */ +/* LOG_PRINT(LOG_WARNING, get_status_msg(801)); */ /* (ptr_andata->nmem_error)++; */ /* return; */ @@ -733,5 +731,5 @@ if ((my_elvalue = malloc(outlength)) == NULL) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { return; } @@ -794,5 +792,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -817,6 +815,6 @@ if (result == 1 /* out of memory */) { - LOG_PRINT(LOG_WARNING, outomem.text); - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + LOG_PRINT(LOG_WARNING, get_status_msg(801)); + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -922,6 +920,6 @@ if (result == 1) { - LOG_PRINT(LOG_WARNING, outomem.text); - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + LOG_PRINT(LOG_WARNING, get_status_msg(801)); + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -951,5 +949,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -967,5 +965,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -985,5 +983,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -1067,5 +1065,5 @@ if (result == 1) { - if ((new_msgpool = mstrcat(ptr_andata->msgpool, outomem_n.text, &(ptr_andata->msgpool_len), 0)) == NULL) { + if ((new_msgpool = mstrcat(ptr_andata->msgpool, (char*)get_status_msg(801), &(ptr_andata->msgpool_len), 0)) == NULL) { (ptr_andata->nmem_error)++; return; @@ -1142,5 +1140,5 @@ if (insert_lilid(ptr_andata->ptr_id_sentinel, ptr_andata->n_note_id)) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); } @@ -1149,5 +1147,5 @@ if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); (ptr_andata->nmem_error)++; } @@ -1196,5 +1194,5 @@ if ((new_msgpool = mstrcat(ptr_andata->msgpool, sql_command, &(ptr_andata->msgpool_len), 0)) == NULL) { - LOG_PRINT(LOG_WARNING, outomem.text); + LOG_PRINT(LOG_WARNING, get_status_msg(801)); (ptr_andata->nmem_error)++; return; Index: refdb.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdb.h,v retrieving revision 1.14.2.1 retrieving revision 1.14.2.2 diff -u -U2 -r1.14.2.1 -r1.14.2.2 --- refdb.h 15 Apr 2005 22:45:08 -0000 1.14.2.1 +++ refdb.h 3 Nov 2005 20:40:19 -0000 1.14.2.2 @@ -54,8 +54,4 @@ #define GETAS 7 -struct BSTRING { - char text[64]; /* the text of the string (up to 63 char + \0) */ - int length; /* the length of the string */ -}; Index: refdbd.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v retrieving revision 1.74.2.19 retrieving revision 1.74.2.20 diff -u -U2 -r1.74.2.19 -r1.74.2.20 --- refdbd.c 28 Oct 2005 23:52:48 -0000 1.74.2.19 +++ refdbd.c 3 Nov 2005 20:40:19 -0000 1.74.2.20 @@ -89,14 +89,4 @@ }; -struct BSTRING outomem = {"out of memory", 13}; -struct BSTRING outomem_n = {"out of memory\n", 14}; -struct BSTRING connerr = {"could not connect to database server", 36}; -struct BSTRING connerr_n = {"could not connect to database server\n", 37}; -struct BSTRING argerr = {"missing argument", 16}; -struct BSTRING argerr_n = {"missing argument\n", 17}; -struct BSTRING positive = {"POS", 3}; -struct BSTRING negative = {"NEG", 3}; -struct BSTRING cgihead_html = {"Content-type: text/html\n\n", 25}; -struct BSTRING cgihead_plain = {"Content-type: text/plain\n\n", 26}; char log_file[PREFS_BUF_LEN] = "/var/log/refdbd.log"; /* custom log file */ @@ -1454,31 +1444,9 @@ /* let the client know what happened */ - if (ref_format == 6) { - html_head = load_html("refdbqp_head", refdblib); - html_foot = load_html("refdbqp_foot", refdblib); - if (!html_head || !html_foot) { - LOG_PRINT(LOG_ERR, "could not load cgi templates"); - } - else { - iwrite(ptr_child_clrequest->fd, cgihead_html.text, cgihead_html.length); - tiwrite(ptr_child_clrequest->fd, html_head, TERM_NO); - free(html_head); - if (ptr_addresult->success) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully added</td></tr>", TERM_NO); - } - else { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Adding reference failed</td></tr>", TERM_NO); - } - tiwrite(ptr_child_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } - } - else { - if (retval != 1) { - n_client_status = read_status(ptr_child_clrequest->fd); - send_status(ptr_child_clrequest->fd, 0, TERM_NO); + if (retval != 1) { + n_client_status = read_status(ptr_child_clrequest->fd); + send_status(ptr_child_clrequest->fd, 0, TERM_NO); - sprintf(child_returnmsg, ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); - } + sprintf(child_returnmsg, ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); } } @@ -1492,34 +1460,9 @@ /* let the client know what happened */ - if (ref_format == 6) { - html_head = load_html("refdbqp_head", refdblib); - html_foot = load_html("refdbqp_foot", refdblib); - if (!html_head || !html_foot) { - LOG_PRINT(LOG_ERR, "could not load cgi templates"); - } - else { - iwrite(ptr_child_clrequest->fd, cgihead_html.text, cgihead_html.length); - tiwrite(ptr_child_clrequest->fd, html_head, TERM_NO); - free(html_head); - if (ptr_addresult->updated) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully updated</td></tr>", TERM_NO); - } - else if (ptr_addresult->success) { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Reference was successfully added</td></tr>", TERM_NO); - } - else { - tiwrite(ptr_child_clrequest->fd, "<tbody><tr><td class=\"result\">Adding reference failed</td></tr>", TERM_NO); - } - tiwrite(ptr_child_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } - } - else { - if (retval != 1) { - n_client_status = read_status(ptr_child_clrequest->fd); - send_status(ptr_child_clrequest->fd, 0, TERM_NO); - - sprintf(child_returnmsg, ULLSPEC" updated:"ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->updated), (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); - } + if (retval != 1) { + n_client_status = read_status(ptr_child_clrequest->fd); + send_status(ptr_child_clrequest->fd, 0, TERM_NO); + + sprintf(child_returnmsg, ULLSPEC" updated:"ULLSPEC" added:"ULLSPEC" skipped:"ULLSPEC" failed\n", (unsigned long long)(ptr_addresult->updated), (unsigned long long)(ptr_addresult->success), (unsigned long long)(ptr_addresult->skipped), (unsigned long long)(ptr_addresult->failure)); } } @@ -1530,5 +1473,5 @@ /* test whether we have a size argument */ if (optind == ptr_child_clrequest->inargc) { - iwrite(ptr_child_clrequest->fd, argerr_n.text, argerr_n.length); + iwrite(ptr_child_clrequest->fd, get_status_msg(111), strlen(get_status_msg(111))); } @@ -2130,5 +2073,5 @@ if ((ptr_clrequest = malloc(sizeof(struct CLIENT_REQUEST))) == NULL) { - LOG_PRINT(LOG_CRIT, outomem.text); + LOG_PRINT(LOG_CRIT, get_status_msg(801)); return NULL; } @@ -2183,5 +2126,5 @@ if ((ptr_new_clrequest = malloc(sizeof(struct CLIENT_REQUEST))) == NULL) { - LOG_PRINT(LOG_CRIT, outomem.text); + LOG_PRINT(LOG_CRIT, get_status_msg(801)); return NULL; } Index: refdbda.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v retrieving revision 1.41.2.20 retrieving revision 1.41.2.21 diff -u -U2 -r1.41.2.20 -r1.41.2.21 --- refdbda.c 29 Sep 2005 22:35:59 -0000 1.41.2.20 +++ refdbda.c 3 Nov 2005 20:40:19 -0000 1.41.2.21 @@ -563,6 +563,4 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ int listdb(struct CLIENT_REQUEST* ptr_clrequest, int select, struct ADDRESULT* ptr_addresult) { - char* html_head; - char* html_foot; char* new_msg; const char* dbname; @@ -592,18 +590,4 @@ } - if (ptr_clrequest->n_cgi) { - html_head = load_html("refdbq_head", refdblib); - html_foot = load_html("refdbq_foot", refdblib); - if (!html_head || !html_foot) { - send_status(ptr_clrequest->fd, 802, TERM_NO); - LOG_PRINT(LOG_ERR, get_status_msg(802)); - free(html_head); - free(html_foot); - dbi_result_free(dbires); - dbi_conn_close(conn); - return 1; - } - } - if (select) { /* selectdb */ @@ -620,5 +604,4 @@ send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(801)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -632,5 +615,4 @@ send_status(ptr_clrequest->fd, 225, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(225)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -641,5 +623,4 @@ send_status(ptr_clrequest->fd, 226, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(226)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -650,14 +631,8 @@ send_status(ptr_clrequest->fd, 226, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(226)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); return 1; } - if (ptr_clrequest->n_cgi) { - tiwrite(ptr_clrequest->fd, "</td></tr>", TERM_NO); - tiwrite(ptr_clrequest->fd, html_foot, TERM_NO); - free(html_foot); - } } else { @@ -673,5 +648,4 @@ send_status(ptr_clrequest->fd, 801, TERM_NO); LOG_PRINT(LOG_INFO, get_status_msg(801)); - free(html_foot); dbi_result_free(dbires); dbi_conn_close(conn); @@ -1298,5 +1272,10 @@ dbires = dbi_conn_query(conn, sql_command); - if (!dbires || !dbi_result_get_numrows_affected(dbires)) { + + /* Postgres does not set numrows_affected for DROP statements so + we can't check easily whether the database was dropped */ + if (!dbires + || (strcmp(drivername, "pgsql") + && !dbi_result_get_numrows_affected(dbires))) { sprintf(sql_command, "249:%s\n", dbname); if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { @@ -1325,5 +1304,5 @@ dbires = dbi_conn_query(conn, sql_command); - if (dbi_conn_error_flag(conn)) { + if (!dbires /*dbi_conn_error_flag(conn)*/) { sprintf(sql_command, "250:%s\n", dbname); if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { @@ -1337,5 +1316,7 @@ } } - dbi_result_free(dbires); + else { + dbi_result_free(dbires); + } } } /* end if pgsql */ Index: refdbdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v retrieving revision 1.36.2.27 retrieving revision 1.36.2.28 diff -u -U2 -r1.36.2.27 -r1.36.2.28 --- refdbdbib.c 2 Oct 2005 23:38:16 -0000 1.36.2.27 +++ refdbdbib.c 3 Nov 2005 20:40:19 -0000 1.36.2.28 @@ -50,19 +50,5 @@ #include "dbfncs.h" -/* these externs are all defined in refdbd.c */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; - -struct BSTRING noqueryaccess = {"could not access query results", 30}; -struct BSTRING noformatupdate = {"could not update format information", 35}; -struct BSTRING noformatupdatecolon = {"could not update format information: ", 37}; -struct BSTRING notempselect = {"temp table select failed", 24}; -struct BSTRING notempselectcolon = {"temp table select failed: ", 26}; -struct BSTRING clientwriterr = {"could not write to client", 25}; - +/* globals */ extern char server_ip[]; extern int n_log_level; Index: refdbdnote.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v retrieving revision 1.25.2.14 retrieving revision 1.25.2.15 diff -u -U2 -r1.25.2.14 -r1.25.2.15 --- refdbdnote.c 2 Nov 2005 22:42:49 -0000 1.25.2.14 +++ refdbdnote.c 3 Nov 2005 20:40:19 -0000 1.25.2.15 @@ -38,12 +38,4 @@ #include "dbfncs.h" -/* some globals */ -extern struct BSTRING outomem; -extern struct BSTRING outomem_n; -extern struct BSTRING connerr; -extern struct BSTRING connerr_n; -extern struct BSTRING positive; -extern struct BSTRING negative; -extern char cs_term[]; #ifndef HAVE_ATOLL @@ -2265,5 +2257,5 @@ send_status(ptr_clrequest->fd, 404, TERM_NO); iwrite(ptr_clrequest->fd, sql_command, result_len); - iwrite(ptr_clrequest->fd, cs_term, TERM_LEN); + tiwrite(ptr_clrequest->fd, "", TERM_YES); ptr_addresult->success++; @@ -2282,5 +2274,5 @@ /* no notes found, send an empty body */ send_status(ptr_clrequest->fd, 402, TERM_NO); - iwrite(ptr... [truncated message content] |
|
From: Markus H. <mho...@us...> - 2005-11-02 22:56:41
|
Update of /cvsroot/refdb/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5083 Modified Files: Tag: Release_0_9_5_stable configure.in Log Message: define _GNU_SOURCE to switch on long long definitions on some platforms Index: configure.in =================================================================== RCS file: /cvsroot/refdb/refdb/configure.in,v retrieving revision 1.49.2.22 retrieving revision 1.49.2.23 diff -u -U2 -r1.49.2.22 -r1.49.2.23 --- configure.in 29 Oct 2005 21:19:42 -0000 1.49.2.22 +++ configure.in 2 Nov 2005 22:56:33 -0000 1.49.2.23 @@ -10,5 +10,8 @@ dnl Use automake -AM_INIT_AUTOMAKE(refdb, 0.9.6-pre4) +AM_INIT_AUTOMAKE(refdb, 0.9.6-pre5) + +dnl switch on GNU extensions +AC_DEFINE(_GNU_SOURCE) dnl see where the libdbi lib is |
|
From: Markus H. <mho...@us...> - 2005-11-02 22:42:57
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2376 Modified Files: Tag: Release_0_9_5_stable refdbdnote.c Log Message: delete_note_by_id(): use remove_user_entries() to get rid of orphan users Index: refdbdnote.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v retrieving revision 1.25.2.13 retrieving revision 1.25.2.14 diff -u -U2 -r1.25.2.13 -r1.25.2.14 --- refdbdnote.c 14 Oct 2005 20:50:12 -0000 1.25.2.13 +++ refdbdnote.c 2 Nov 2005 22:42:49 -0000 1.25.2.14 @@ -608,8 +608,7 @@ /* search orphans in t_user */ if (n_user_id) { - sprintf(sql_command, "SELECT xuser_id FROM t_xuser WHERE user_id="ULLSPEC, (unsigned long long)n_user_id); - LOG_PRINT(LOG_DEBUG, sql_command); - dbires = dbi_conn_query(conn, sql_command); - if (!dbires) { + result = remove_user_entries(n_user_id, conn); + + if (result != 0 && result != 4) { /* send message to client, reuse sql_command */ sprintf(sql_command, "234:"ULLSPEC"\n", (unsigned long long)idval); @@ -626,33 +625,4 @@ return 234; } - - numrows = dbi_result_get_numrows(dbires); - - if (!numrows) { - /* no other note or reference belong to this user */ - /* delete entry in t_user table */ - sprintf(sql_command, "DELETE FROM t_user WHERE user_id="ULLSPEC, (unsigned long long)n_user_id); - LOG_PRINT(LOG_DEBUG, sql_command); - dbires1 = dbi_conn_query(conn, sql_command); - if (!dbires1) { - /* send message to client, reuse sql_command */ - sprintf(sql_command, "247:"ULLSPEC"\n", (unsigned long long)idval); - if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - ptr_addresult->msg = new_msg; - } - dbi_result_free(dbires); - my_dbi_conn_unlock(conn); - my_dbi_conn_rollback(conn); - LOG_PRINT(LOG_WARNING, get_status_msg(247)); - return 247; - } - dbi_result_free(dbires1); - } - - dbi_result_free(dbires); } /* end if n_user_id */ |
|
From: Markus H. <mho...@us...> - 2005-11-02 22:41:22
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2072 Modified Files: Tag: Release_0_9_5_stable refdbdref.c Log Message: delete_ref_by_id(): use remove_user_entries() to get rid of orphan users Index: refdbdref.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v retrieving revision 1.65.2.21 retrieving revision 1.65.2.22 diff -u -U2 -r1.65.2.21 -r1.65.2.22 --- refdbdref.c 26 Oct 2005 19:11:00 -0000 1.65.2.21 +++ refdbdref.c 2 Nov 2005 22:41:12 -0000 1.65.2.22 @@ -60,5 +60,5 @@ #include "risdata.h" -#define _GNU_SOURCE /* need this for long long support on some platforms */ +/* #define _GNU_SOURCE */ /* need this for long long support on some platforms */ /* some globals */ @@ -1220,6 +1220,6 @@ char* new_msg; int result; - unsigned long long n_id; - unsigned long long n_xid; + unsigned long long n_id = 0; + unsigned long long n_xid = 0; unsigned long long n_periodical_id; unsigned long long numrows; @@ -1294,12 +1294,17 @@ int used_by_other = 1; + if (dbi_result_next_row(dbires_user) == 0) { + dbi_result_free(dbires_user); + my_dbi_conn_unlock(conn); + my_dbi_conn_rollback(conn); + LOG_PRINT(LOG_WARNING, get_status_msg(234)); + return 234; + } + + /* save for later use */ + n_id = my_dbi_result_get_idval(dbires_user, "user_id"); + n_xid = my_dbi_result_get_idval(dbires_user, "xuser_id"); + if (dbi_result_get_numrows(dbires_user) == 1) { - if (dbi_result_next_row(dbires_user) == 0) { - dbi_result_free(dbires_user); - my_dbi_conn_unlock(conn); - my_dbi_conn_rollback(conn); - LOG_PRINT(LOG_WARNING, get_status_msg(234)); - return 234; - } if (!strcmp(ptr_clrequest->username, my_dbi_result_get_string(dbires_user, "user_name"))) { @@ -1451,5 +1456,5 @@ } - /* "delete" entry in main table */ + /* delete entry in main table */ sprintf(sql_command, "DELETE FROM t_refdb WHERE refdb_id="ULLSPEC, idval); LOG_PRINT(LOG_DEBUG, sql_command); @@ -1474,78 +1479,48 @@ dbi_result_free(dbires); - /* search orphans in t_user. The query returning dbires_user ran above */ - while (dbi_result_next_row(dbires_user)) { - n_id = my_dbi_result_get_idval(dbires_user, "user_id"); - n_xid = my_dbi_result_get_idval(dbires_user, "xuser_id"); - sprintf(sql_command, "SELECT xuser_id FROM t_xuser WHERE user_id="ULLSPEC, (unsigned long long)n_id); - LOG_PRINT(LOG_DEBUG, sql_command); - dbires1 = dbi_conn_query(conn, sql_command); - if (!dbires1) { - /* send message to client, reuse sql_command */ - sprintf(sql_command, "234:"ULLSPEC"\n", (unsigned long long)idval); - if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - ptr_addresult->msg = new_msg; - } - dbi_result_free(dbires_user); - my_dbi_conn_unlock(conn); - my_dbi_conn_rollback(conn); - LOG_PRINT(LOG_WARNING, get_status_msg(234)); - return 234; + /* search orphans in t_user. The query returning dbires_user ran + above. The loop should run only once */ + /* delete entry in xuser table */ + sprintf(sql_command, "DELETE FROM t_xuser WHERE xuser_id="ULLSPEC, (unsigned long long)n_xid); + LOG_PRINT(LOG_DEBUG, sql_command); + dbires = dbi_conn_query(conn, sql_command); + if (!dbires) { + /* send message to client, reuse sql_command */ + sprintf(sql_command, "234:"ULLSPEC"\n", (unsigned long long)idval); + if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + return 801; } - - numrows = dbi_result_get_numrows(dbires1); - - if (numrows == 1) { /* if no other reference uses this user */ - /* delete entry in t_user table */ - sprintf(sql_command, "DELETE FROM t_user WHERE user_id="ULLSPEC, (unsigned long long)n_id); - LOG_PRINT(LOG_DEBUG, sql_command); - dbires2 = dbi_conn_query(conn, sql_command); - if (!dbires2) { - /* send message to client, reuse sql_command */ - sprintf(sql_command, "247:"ULLSPEC"\n", (unsigned long long)idval); - if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - ptr_addresult->msg = new_msg; - } - dbi_result_free(dbires_user); - dbi_result_free(dbires1); - my_dbi_conn_unlock(conn); - my_dbi_conn_rollback(conn); - LOG_PRINT(LOG_WARNING, get_status_msg(247)); - return 247; - } - dbi_result_free(dbires2); + else { + ptr_addresult->msg = new_msg; } + dbi_result_free(dbires_user); + my_dbi_conn_unlock(conn); + my_dbi_conn_rollback(conn); + LOG_PRINT(LOG_WARNING, get_status_msg(234)); + return 234; + } - /* delete entry in xuser table */ - sprintf(sql_command, "DELETE FROM t_xuser WHERE xuser_id="ULLSPEC, (unsigned long long)n_xid); - LOG_PRINT(LOG_DEBUG, sql_command); - dbires2 = dbi_conn_query(conn, sql_command); - if (!dbires2) { - /* send message to client, reuse sql_command */ - sprintf(sql_command, "234:"ULLSPEC"\n", (unsigned long long)idval); - if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { - LOG_PRINT(LOG_CRIT, get_status_msg(801)); - return 801; - } - else { - ptr_addresult->msg = new_msg; - } + dbi_result_free(dbires); + + /* delete entry in user table */ + result = remove_user_entries(n_id, conn); + + if (result != 0 && result != 4) { + /* send message to client, reuse sql_command */ + sprintf(sql_command, "234:"ULLSPEC"\n", (unsigned long long)idval); + if ((new_msg = mstrcat(ptr_addresult->msg, sql_command, &(ptr_addresult->msg_len), 0)) == NULL) { dbi_result_free(dbires_user); - dbi_result_free(dbires1); - my_dbi_conn_unlock(conn); - my_dbi_conn_rollback(conn); - LOG_PRINT(LOG_WARNING, get_status_msg(234)); - return 234; + LOG_PRINT(LOG_CRIT, get_status_msg(801)); + return 801; + } + else { + ptr_addresult->msg = new_msg; } - dbi_result_free(dbires2); - dbi_result_free(dbires1); + dbi_result_free(dbires_user); + my_dbi_conn_unlock(conn); + my_dbi_conn_rollback(conn); + LOG_PRINT(LOG_WARNING, get_status_msg(234)); + return 234; } |
|
From: Markus H. <mho...@us...> - 2005-11-02 22:38:09
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1479 Modified Files: Tag: Release_0_9_5_stable risdb.c risdb.h Log Message: new function remove_user_entries() Index: risdb.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/risdb.c,v retrieving revision 1.44.2.11 retrieving revision 1.44.2.12 diff -u -U2 -r1.44.2.11 -r1.44.2.12 --- risdb.c 18 Sep 2005 22:51:25 -0000 1.44.2.11 +++ risdb.c 2 Nov 2005 22:37:52 -0000 1.44.2.12 @@ -3445,4 +3445,69 @@ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + remove_user_entries(): removes the user entry associated with + a particular dataset if it is an orphan + + int remove_user_entries returns 0 if ok, > 0 if error + error codes: 1 = select from t_user failed + 2 = select from t_note failed + 3 = delete from t_user failed + 4 = not an orphan + + unsigned long long user_id id of the user to be deleted + + dbi_conn conn the database connection + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ +int remove_user_entries(unsigned long long user_id, dbi_conn conn) { + char sql_command[256]; + unsigned long long numrows; + + dbi_result dbires; + + /* select all xuser and note entries of the given user; if there are + none, the user is an orphan and can safely be deleted */ + sprintf(sql_command, "SELECT xuser_id FROM t_xuser WHERE user_id="ULLSPEC, (unsigned long long)user_id); + + LOG_PRINT(LOG_DEBUG, sql_command); + dbires = dbi_conn_query(conn, sql_command); + if (!dbires) { + LOG_PRINT(LOG_WARNING, "select from t_xuser failed"); + return 1; + } + + numrows = dbi_result_get_numrows(dbires); + + dbi_result_free(dbires); + + sprintf(sql_command, "SELECT note_id FROM t_note WHERE note_user_id="ULLSPEC, (unsigned long long)user_id); + + LOG_PRINT(LOG_DEBUG, sql_command); + dbires = dbi_conn_query(conn, sql_command); + if (!dbires) { + LOG_PRINT(LOG_WARNING, "select from t_note failed"); + return 2; + } + + numrows += dbi_result_get_numrows(dbires); + + dbi_result_free(dbires); + + if (!numrows) { + /* no other note or reference belong to this user */ + /* delete entry in t_user table */ + sprintf(sql_command, "DELETE FROM t_user WHERE user_id="ULLSPEC, (unsigned long long)user_id); + LOG_PRINT(LOG_DEBUG, sql_command); + dbires = dbi_conn_query(conn, sql_command); + if (!dbires) { + return 3; + } + dbi_result_free(dbires); + return 0; + } + + return 4; +} + +/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ remove_xuser_entries(): removes the xuser entry associated with a particular dataset and a particular user Index: risdb.h =================================================================== RCS file: /cvsroot/refdb/refdb/src/risdb.h,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -U2 -r1.11.2.3 -r1.11.2.4 --- risdb.h 7 Sep 2005 23:45:03 -0000 1.11.2.3 +++ risdb.h 2 Nov 2005 22:37:52 -0000 1.11.2.4 @@ -37,4 +37,5 @@ int remove_xnote_entries(unsigned long long xref_id, dbi_conn conn, int mode); int remove_periodical_entries(unsigned long long periodical_id, dbi_conn conn); +int remove_user_entries(unsigned long long user_id, dbi_conn conn); int remove_xuser_entries(unsigned long long ref_id, char* set_owner, dbi_conn conn); int remove_ulink_entries(unsigned long long ref_id, dbi_conn conn, int mode); |
|
From: Markus H. <mho...@us...> - 2005-10-29 21:19:51
|
Update of /cvsroot/refdb/refdb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24141 Modified Files: Tag: Release_0_9_5_stable configure.in Log Message: prerelease 4 Index: configure.in =================================================================== RCS file: /cvsroot/refdb/refdb/configure.in,v retrieving revision 1.49.2.21 retrieving revision 1.49.2.22 diff -u -U2 -r1.49.2.21 -r1.49.2.22 --- configure.in 18 Oct 2005 19:59:19 -0000 1.49.2.21 +++ configure.in 29 Oct 2005 21:19:42 -0000 1.49.2.22 @@ -10,5 +10,5 @@ dnl Use automake -AM_INIT_AUTOMAKE(refdb, 0.9.6-pre3) +AM_INIT_AUTOMAKE(refdb, 0.9.6-pre4) dnl see where the libdbi lib is |
|
From: Markus H. <mho...@us...> - 2005-10-28 23:54:03
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8806 Modified Files: Tag: Release_0_9_5_stable eenc.c refdba.c refdbc.c refdbib.c Log Message: remove ioctl hack for detecting pending data on stdin Index: eenc.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/eenc.c,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -U2 -r1.1 -r1.1.2.1 --- eenc.c 17 Mar 2003 22:48:40 -0000 1.1 +++ eenc.c 28 Oct 2005 23:53:55 -0000 1.1.2.1 @@ -22,5 +22,4 @@ #include <stdio.h> #include <stdlib.h> -#include <sys/ioctl.h> #include "getopt.h" @@ -37,14 +36,4 @@ char numberized_passwd[3*PASSWD_LENGTH+1]; -#ifdef FIONREAD - if (ioctl(fileno(stdin), FIONREAD, &n_inbytes) != -1) { - if (n_inbytes > 0) { - n_read_stdin = 1; - } - } - /* else: there was an error, and we can't safely assume that we can - read from stdin */ -#endif - /* read command line settings */ while ((n_opt = getopt(argc, argv, "hp:")) != -1) { @@ -71,12 +60,12 @@ passwd[PASSWD_LENGTH] = '\0'; } - else if (n_read_stdin) { + else { if (!fgets(passwd, PASSWD_LENGTH+1, stdin)) { exit(0); } - } - else { - fprintf(stderr, "no password specified\n"); - exit(1); + /* remove trailing newline */ + if (passwd[strlen(passwd)-1] == '\n') { + passwd[strlen(passwd)-1] = '\0'; + } } Index: refdba.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdba.c,v retrieving revision 1.45.2.7 retrieving revision 1.45.2.8 diff -u -U2 -r1.45.2.7 -r1.45.2.8 --- refdba.c 29 Jul 2005 21:15:35 -0000 1.45.2.7 +++ refdba.c 28 Oct 2005 23:53:55 -0000 1.45.2.8 @@ -28,8 +28,4 @@ #include <sys/fcntl.h> -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - #include <signal.h> #include <stdio.h> @@ -211,21 +207,4 @@ } - /* switch on reading from stdin if we receive data on stdin via a - redirection or a pipe. */ -/* if (!isatty(fileno(stdin)) && !n_cgi_env) { */ -/* n_read_stdin = 1; */ -/* } */ -#ifdef FIONREAD - if (ioctl(fileno(stdin), FIONREAD, &n_inbytes) != -1) { - if (n_inbytes > 0) { - n_read_stdin = 1; - } - } - /* else: there was an error, and we can't safely assume that we can - read from stdin */ -#endif - /* else: if FIONREAD is not supported, commands that accept input - from stdin must be called with the '-f stdin' switch */ - /* initialize the array of preference values */ prefs[0].varvalue = server_ip; @@ -1061,5 +1040,5 @@ /* open data source for reading if necessary */ - if (n_read_file || n_read_stdin) { + if (n_read_file || n_read_stdin || optind == inargc) { if (n_read_file) { infile_fd = open(infile, O_RDONLY|O_BINARY); @@ -1067,4 +1046,5 @@ else { infile_fd = fileno(stdin); + n_read_stdin = 1; /* not set if optind == inargc */ } if (infile_fd == -1) { @@ -1412,5 +1392,5 @@ case 'h': if (n_remove) { - printf("Removes reserved journal words\nSyntax: addword [-h] {word|-f infile}\nOptions: -f infile Read the words from infile\n -h prints this mini-help\n All other arguments are interpreted as words.\n"); + printf("Removes reserved journal words\nSyntax: deleteword [-h] {word|-f infile}\nOptions: -f infile Read the words from infile\n -h prints this mini-help\n All other arguments are interpreted as words.\n"); } else { @@ -1503,5 +1483,5 @@ /* open data source for reading if necessary */ - if (n_read_file || n_read_stdin) { + if (n_read_file || n_read_stdin || optind == inargc) { if (n_read_file) { infile_fd = open(infile, O_RDONLY|O_BINARY); @@ -1509,4 +1489,5 @@ else { infile_fd = fileno(stdin); + n_read_stdin = 1; /* not set if optind == inargc */ } if (infile_fd == -1) { @@ -1912,7 +1893,8 @@ } - if (n_read_stdin) { + if (n_read_stdin || optind == inargc) { infp = stdin; numcycles = 1; + n_read_stdin = 1; /* not set if optind == inargc */ } else { Index: refdbc.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbc.c,v retrieving revision 1.72.2.12 retrieving revision 1.72.2.13 diff -u -U2 -r1.72.2.12 -r1.72.2.13 --- refdbc.c 14 Oct 2005 20:48:37 -0000 1.72.2.12 +++ refdbc.c 28 Oct 2005 23:53:55 -0000 1.72.2.13 @@ -31,8 +31,4 @@ #include <sys/stat.h> -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif - #include <stdio.h> #include <errno.h> @@ -255,18 +251,4 @@ } - /* switch on reading from stdin if we receive data on stdin via a - redirection or a pipe. */ -#ifdef FIONREAD - if (ioctl(fileno(stdin), FIONREAD, &n_inbytes) != -1) { - if (n_inbytes > 0) { - n_read_stdin = 1; - } - } - /* else: there was an error, and we can't safely assume that we can - read from stdin */ -#endif - /* else: if FIONREAD is not supported, commands that accept input - from stdin must be called with the '-f stdin' switch */ - if ((the_command = malloc(the_command_len)) == NULL) { write_err("out of memory\n"); @@ -1111,9 +1093,6 @@ if (!n_cgi) { /* prepare data */ - if (n_read_file || n_read_stdin) { - if (n_read_stdin) { - infilefp = stdin; - } - else { + if (n_read_file || n_read_stdin || optind == inargc) { + if (n_read_file) { if ((infilefp = fopen(infile, "rb")) == NULL) { delete_all_lilimem(&sentinel); @@ -1122,4 +1101,9 @@ } } + else { + infilefp = stdin; + n_read_stdin = 1; /* not set if optind == inargc */ + } + result = add_id_from_ris(infilefp, &(slvals.outbuffer), &outbuf_len); @@ -1171,5 +1155,5 @@ sprintf(cmd_buffer+strlen(cmd_buffer), " %d", strlen(slvals.outbuffer)+TERM_LEN); -/* printf("%s\n", outbuffer); */ +/* printf("outbuffer went to: %s<<\n", slvals.outbuffer); */ /* send command to application server */ @@ -1506,9 +1490,6 @@ if (!n_cgi) { /* prepare data */ - if (n_read_file || n_read_stdin) { - if (n_read_stdin) { - infilefp = stdin; - } - else { + if (n_read_file || n_read_stdin || optind == inargc) { + if (n_read_file) { if ((infilefp = fopen(infile, "rb")) == NULL) { send_status(slvals.n_sockfd, 112, TERM_NO); @@ -1518,4 +1499,9 @@ } } + else { + infilefp = stdin; + n_read_stdin = 1; /* not set if optind == inargc */ + } + result = add_id_from_ris(infilefp, &(slvals.outbuffer), &outbuf_len); @@ -1961,8 +1947,8 @@ /* todo: read securely from a file without buffer overflows resize string as needed */ - if (n_read_file || n_read_stdin) { + if (n_read_file || n_read_stdin || optind == inargc) { char filebuffer[COMMAND_INBUF_LEN]; - if (!n_read_stdin) { + if (n_read_file) { infilefp = fopen(infile, "rb"); if (infilefp == NULL) { @@ -1975,4 +1961,5 @@ else { infilefp = stdin; /* stdin is already open */ + n_read_stdin = 1; /* not set if optind == inargc */ } @@ -3253,15 +3240,13 @@ } - if (n_cgi) { - numcycles = 1; - } - else if (n_read_stdin) { + if (n_read_stdin || optind == inargc) { infp = stdin; numcycles = 1; + n_read_stdin = 1; /* not set if optind == inargc */ } else { numcycles = inargc-optind; } -/* printf("%d\n", numcycles); */ +/* printf("%d\n", numcycles); */ for (k = 0; k < numcycles; k++) { if (!n_read_stdin && !n_cgi) { @@ -3276,4 +3261,5 @@ /* runs phases 1 through 4 of communication protocol */ if (!strcmp(my_reftype, "ris")) { + printf("call send_ris_data()\n"); n_send_result = send_ris_data(infp, pagerfp, errstream, n_sockfd, &ris_set_buffer, &n_setlength, &n_setcount, default_ris, n_cgi, &byte_written); } @@ -3949,10 +3935,8 @@ } - if (n_cgi) { - numcycles = 1; - } - else if (n_read_stdin) { + if (n_read_stdin || optind == inargc) { infp = stdin; numcycles = 1; + n_read_stdin = 1; /* not set if optind == inargc */ } else { @@ -3961,5 +3945,5 @@ /* printf("%d\n", numcycles); */ for (k = 0; k < numcycles; k++) { - if (!n_read_stdin && !n_cgi) { + if (!n_read_stdin) { /* try to open our target file */ infp = fopen(inargv[optind+k], "rb"); @@ -4362,9 +4346,6 @@ /* prepare data */ - if (n_read_file || n_read_stdin) { - if (n_read_stdin) { - infilefp = stdin; - } - else { + if (n_read_file || n_read_stdin || optind == inargc) { + if (n_read_file) { if ((infilefp = fopen(infile, "rb")) == NULL) { delete_all_lilimem(&sentinel); @@ -4373,4 +4354,8 @@ } } + else { + infilefp = stdin; + n_read_stdin = 1; /* not set if optind == inargc */ + } result = add_id_from_ris(infilefp, &(slvals.outbuffer), &outbuf_len); @@ -4712,6 +4697,6 @@ - if (n_read_file || n_read_stdin) { - if (!n_read_stdin) { + if (n_read_file || n_read_stdin || optind == inargc) { + if (n_read_file) { infilefp = fopen(infile, "rb"); if (infilefp == NULL) { @@ -4724,4 +4709,5 @@ else { infilefp = stdin; /* stdin is already open */ + n_read_stdin = 1; /* not set if optind == inargc */ } Index: refdbib.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbib.c,v retrieving revision 1.41.2.4 retrieving revision 1.41.2.5 diff -u -U2 -r1.41.2.4 -r1.41.2.5 --- refdbib.c 29 Jul 2005 21:15:42 -0000 1.41.2.4 +++ refdbib.c 28 Oct 2005 23:53:55 -0000 1.41.2.5 @@ -173,21 +173,4 @@ } - /* switch on reading from stdin if we receive data on stdin via a - redirection or a pipe. */ -/* if (!isatty(fileno(stdin))) { */ -/* n_read_stdin = 1; */ -/* } */ -#ifdef FIONREAD - if (ioctl(fileno(stdin), FIONREAD, &n_inbytes) != -1) { - if (n_inbytes > 0) { - n_read_stdin = 1; - } - } - /* else: there was an error, and we can't safely assume that we can - read from stdin */ -#endif - /* else: if FIONREAD is not supported, commands that accept input - from stdin must be called with the '-f stdin' switch */ - /* initialize the array of preference values */ prefs[0].varvalue = server_ip; @@ -448,5 +431,6 @@ } else { - if (n_read_stdin) { + if (n_read_stdin || optind == argc) { + n_read_stdin = 1; /* not set if optind == inargc */ if (n_type == 3) { /* bibtex */ n_exit_code = make_texbib(stdin); |
|
From: Markus H. <mho...@us...> - 2005-10-28 23:52:56
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8667 Modified Files: Tag: Release_0_9_5_stable refdbd.c Log Message: when closing client connection, use correct fd Index: refdbd.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v retrieving revision 1.74.2.18 retrieving revision 1.74.2.19 diff -u -U2 -r1.74.2.18 -r1.74.2.19 --- refdbd.c 11 Oct 2005 20:32:55 -0000 1.74.2.18 +++ refdbd.c 28 Oct 2005 23:52:48 -0000 1.74.2.19 @@ -2007,5 +2007,5 @@ /* decrease n_max_fd to minimize loops */ - delete_olili(&first_olili, client_sockfd); + delete_olili(&first_olili, ptr_clrequest->fd); } /* end if fork() */ } /* end: if (fd == server_sockfd) */ |
|
From: Markus H. <mho...@us...> - 2005-10-28 23:49:53
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8011 Modified Files: Tag: Release_0_9_5_stable readris.c Log Message: read_ris_set(): use feof() instead of checking errno Index: readris.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/readris.c,v retrieving revision 1.12.2.3 retrieving revision 1.12.2.4 diff -u -U2 -r1.12.2.3 -r1.12.2.4 --- readris.c 29 Jul 2005 21:15:35 -0000 1.12.2.3 +++ readris.c 28 Oct 2005 23:49:45 -0000 1.12.2.4 @@ -122,5 +122,10 @@ if (result == NULL) { free(linebuffer); - return 2; + if (feof(fp)) { + return 2; + } + else { + return 0; + } } } @@ -140,11 +145,11 @@ while (!setdone) { result = fgets(linebuffer, RIS_LINE_SIZE, fp); - if (result == NULL && errno != EOF) { -/* free(linebuffer); */ -/* return 0; */ - filedone++; - setdone++; + if (result == NULL && !feof(fp)) { + free(linebuffer); + return 0; +/* filedone++; */ +/* setdone++; */ } - if (result == NULL && errno == EOF) { + else if (result == NULL /* EOF */) { filedone++; setdone++; |
|
From: Markus H. <mho...@us...> - 2005-10-28 23:47:40
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7563 Modified Files: Tag: Release_0_9_5_stable linklist.c Log Message: delete_olili(): fixed stupid stupid = vs == typo Index: linklist.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/linklist.c,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -u -U2 -r1.9.2.3 -r1.9.2.4 --- linklist.c 17 Sep 2005 21:30:32 -0000 1.9.2.3 +++ linklist.c 28 Oct 2005 23:47:33 -0000 1.9.2.4 @@ -89,5 +89,5 @@ while (ptr_curr != NULL) { - if (ptr_curr->fd = value) { /* got it */ + if (ptr_curr->fd == value) { /* got it */ break; } |
|
From: Markus H. <mho...@us...> - 2005-10-26 19:11:08
|
Update of /cvsroot/refdb/refdb/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2893 Modified Files: Tag: Release_0_9_5_stable refdbdref.c Log Message: added _GNU_SOURCE to toggle on long long support on some platforms Index: refdbdref.c =================================================================== RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v retrieving revision 1.65.2.20 retrieving revision 1.65.2.21 diff -u -U2 -r1.65.2.20 -r1.65.2.21 --- refdbdref.c 22 Oct 2005 20:42:58 -0000 1.65.2.20 +++ refdbdref.c 26 Oct 2005 19:11:00 -0000 1.65.2.21 @@ -60,4 +60,6 @@ #include "risdata.h" +#define _GNU_SOURCE /* need this for long long support on some platforms */ + /* some globals */ extern struct BSTRING outomem; |
|
From: Markus H. <mho...@us...> - 2005-10-23 21:07:01
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19589 Modified Files: programming.html Log Message: updated to new Perl client library Index: programming.html =================================================================== RCS file: /cvsroot/refdb/homepage/programming.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -U2 -r1.1 -r1.2 --- programming.html 7 Oct 2005 22:11:42 -0000 1.1 +++ programming.html 23 Oct 2005 21:06:54 -0000 1.2 @@ -139,6 +139,6 @@ <h2 id="general">General Features</h2> <p class="authors">Author: Markus Hoenicka <mho...@us...></p> - <p><strong><a href="pre/RefDBClient-Client-1.11.tar.gz">Download RefDBClient-Client-1.11.tar.gz</a></strong></p> - <p><strong>Note:</strong>This version requires <a href="pre/refdb-latest.tar.gz">refdb-0.9.6-pre2 or later</a> or a current CVS version of RefDB.</p> + <p><strong><a href="pre/RefDBClient-Client-1.13.tar.gz">Download RefDBClient-Client-1.13.tar.gz</a></strong></p> + <p><strong>Note:</strong>This version requires <a href="pre/refdb-latest.tar.gz">refdb-0.9.6-pre3 or later</a> or a current CVS version of RefDB.</p> <p>The Perl client module <code>RefDBClient::Client</code> allows Perl programmers to access the refdbd server from Perl scripts. The client/server dialog is implemented entirely in Perl. That is, you don't need the C clients installed on your system in order to run a Perl script using this module. The module allows an object-oriented approach to all RefDB client commands.</p> |
|
From: Markus H. <mho...@us...> - 2005-10-23 21:06:50
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19453 Modified Files: emacs.html Log Message: removed link to full-size image Index: emacs.html =================================================================== RCS file: /cvsroot/refdb/homepage/emacs.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -U2 -r1.4 -r1.5 --- emacs.html 23 Oct 2005 15:34:06 -0000 1.4 +++ emacs.html 23 Oct 2005 21:06:30 -0000 1.5 @@ -156,5 +156,5 @@ <p class="legend"><img alt="Emacs ris-mode" src="screenshots/rismode.png"/></p> - <p class="legend"><strong>Fig. 1:</strong> Emacs ris-mode. Click on the image to see a <a href="rismode.png">larger version</a>. The reference shows the effects of a few common syntax errors: (1) the last author has a space after the period, (2) the secondary publication date lacks the mandatory slashes, (3) the JF tag is misspelled, and (4) the ER tag lacks the trailing space. Note also that fields with unlimited length (like AD) and fields with limited length (like KW) are colored differently.</p> + <p class="legend"><strong>Fig. 1:</strong> Emacs ris-mode. The reference shows the effects of a few common syntax errors: (1) the last author has a space after the period, (2) the secondary publication date lacks the mandatory slashes, (3) the JF tag is misspelled, and (4) the ER tag lacks the trailing space. Note also that fields with unlimited length (like AD) and fields with limited length (like KW) are colored differently.</p> |
|
From: Markus H. <mho...@us...> - 2005-10-23 20:48:18
|
Update of /cvsroot/refdb/homepage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15495 Modified Files: vim.html Log Message: moved images to screenshots subdir Index: vim.html =================================================================== RCS file: /cvsroot/refdb/homepage/vim.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -U2 -r1.3 -r1.4 --- vim.html 7 Oct 2005 22:59:19 -0000 1.3 +++ vim.html 23 Oct 2005 20:48:07 -0000 1.4 @@ -162,6 +162,6 @@ </ul> - <p class="legend"><a href="vimdbxml-menus-01.png"><img alt="Vim DocBook XML Menus" src="vimdbxml-menus-01-small.png"/></a></p> - <p class="legend"><strong>Fig. 4:</strong> GVim editing a DocBook XML file. All the DocBook XML supplied menus are being displayed (they have been "torn off"). The left-most menu is the parent menu. The citations (RefDB) menu is seen on the far right. Note that users of console vim also have access to these menus (see vim help topic 'console-menus'. Click on the image to see a <a href="vimdbxml-menus-01-small.png">larger version</a>.</p> + <p class="legend"><a href="screenshots/vimdbxml-menus-01.png"><img alt="Vim DocBook XML Menus" src="screenshots/vimdbxml-menus-01-small.png"/></a></p> + <p class="legend"><strong>Fig. 4:</strong> GVim editing a DocBook XML file. All the DocBook XML supplied menus are being displayed (they have been "torn off"). The left-most menu is the parent menu. The citations (RefDB) menu is seen on the far right. Note that users of console vim also have access to these menus (see vim help topic 'console-menus'. Click on the image to see a <a href="screenshots/vimdbxml-menus-01-small.png">larger version</a>.</p> <h2 id="vimris">Vim and RIS editing</h2> @@ -188,6 +188,6 @@ </ul> - <p class="legend"><a href="vimris-01.png"><img alt="Vim editing RIS" src="vimris-01-small.jpg"/></a></p> - <p class="legend"><strong>Fig. 5:</strong> Vim editing RIS. Click on the image to see a <a href="vimris-01.png">larger version</a>. The image shows how Vim spots a few common syntax errors: (1) the second author uses a space after the comma, (2) the publication date lacks the mandatory slashes, and (3) the end tag lacks the trailing space.</p> + <p class="legend"><a href="screenshots/vimris-01.png"><img alt="Vim editing RIS" src="screenshots/vimris-01-small.jpg"/></a></p> + <p class="legend"><strong>Fig. 5:</strong> Vim editing RIS. Click on the image to see a <a href="screenshots/vimris-01.png">larger version</a>. The image shows how Vim spots a few common syntax errors: (1) the second author uses a space after the comma, (2) the publication date lacks the mandatory slashes, and (3) the end tag lacks the trailing space.</p> </div> |
1 message has been excluded from this view by a project administrator.
