refdb-cvs — All cvs checkins go to this list

[Refdb-cvs] CVS: refdb/styles Eur.J.Pharmacol.xml,1.6,1.7 J.Biol.Chem.xml,1.7,1.8 bibtex-abbrev.xml,1.2,1.3 bibtex-full.xml,1.2,1.3

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/styles
In directory sc8-pr-cvs1:/tmp/cvs-serv15264/styles

Modified Files:
	Eur.J.Pharmacol.xml J.Biol.Chem.xml bibtex-abbrev.xml 
	bibtex-full.xml 
Log Message:
updated prologs

Index: Eur.J.Pharmacol.xml
===================================================================
RCS file: /cvsroot/refdb/refdb/styles/Eur.J.Pharmacol.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -U2 -r1.6 -r1.7
--- Eur.J.Pharmacol.xml	19 Sep 2003 22:49:34 -0000	1.6
+++ Eur.J.Pharmacol.xml	6 Jan 2004 21:49:40 -0000	1.7
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN" "http://refdb.sourceforge.net/dtd/citestylex.dtd">
+<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN" "http://refdb.sourceforge.net/dtd/citestylex-1.0/citestylex.dtd">
 <CITESTYLE>
   <STYLENAME>Eur.J.Pharmacol.</STYLENAME>

Index: J.Biol.Chem.xml
===================================================================
RCS file: /cvsroot/refdb/refdb/styles/J.Biol.Chem.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -U2 -r1.7 -r1.8
--- J.Biol.Chem.xml	19 Sep 2003 22:49:34 -0000	1.7
+++ J.Biol.Chem.xml	6 Jan 2004 21:49:40 -0000	1.8
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN" "http://refdb.sourceforge.net/dtd/citestylex.dtd">
+<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN" "http://refdb.sourceforge.net/dtd/citestylex-1.0/citestylex.dtd">
 <CITESTYLE>
   <STYLENAME>J.Biol.Chem.</STYLENAME>

Index: bibtex-abbrev.xml
===================================================================
RCS file: /cvsroot/refdb/refdb/styles/bibtex-abbrev.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- bibtex-abbrev.xml	13 Dec 2002 20:35:44 -0000	1.2
+++ bibtex-abbrev.xml	6 Jan 2004 21:49:40 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle XML//EN"

-    "http://refdb.sourceforge.net/dtd/citestylex.dtd">

+<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN"

+    "http://refdb.sourceforge.net/dtd/citestylex-1.0/citestylex.dtd">

 <CITESTYLE>

   <STYLENAME>bibtex-abbrev</STYLENAME>


Index: bibtex-full.xml
===================================================================
RCS file: /cvsroot/refdb/refdb/styles/bibtex-full.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- bibtex-full.xml	13 Dec 2002 20:35:44 -0000	1.2
+++ bibtex-full.xml	6 Jan 2004 21:49:40 -0000	1.3
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle XML//EN" 

-                           "http://refdb.sourceforge.net/dtd/citestylex.dtd">

+<!DOCTYPE CITESTYLE PUBLIC "-//Markus Hoenicka//DTD CiteStyle V1.0//EN" 

+       "http://refdb.sourceforge.net/dtd/citestylex-1.0/citestylex.dtd">

 <CITESTYLE>

   <STYLENAME>bibtex-full</STYLENAME>

[Refdb-cvs] CVS: refdb configure.in,1.41,1.42

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv9589

Modified Files:
	configure.in 
Log Message:
removed site-lisp from AC_OUTPUT

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -U2 -r1.41 -r1.42
--- configure.in	6 Jan 2004 20:31:20 -0000	1.41
+++ configure.in	6 Jan 2004 21:23:17 -0000	1.42
@@ -322,5 +322,5 @@
 dnl AM_PATH_LISPDIR
 
-AC_OUTPUT(src/Makefile scripts/Makefile site-lisp/Makefile cgi/Makefile etc/Makefile dtd/Makefile declarations/Makefile examples/Makefile styles/Makefile dsssl/Makefile dsssl/refdb/Makefile dsssl/refdb/html/Makefile dsssl/refdb/print/Makefile dsssl/refdb/lib/Makefile xsl/Makefile xsl/refdb/Makefile xsl/refdb/common-refdb/Makefile xsl/refdb/docbk-refdb-xsl/Makefile xsl/refdb/docbk-refdb-xsl/docbk-fo/Makefile xsl/refdb/docbk-refdb-xsl/docbk-html/Makefile xsl/refdb/docbk-refdb-xsl/docbk-xhtml/Makefile xsl/refdb/docbk-refdb-xsl/docbk-lib/Makefile xsl/refdb/tei-refdb-xsl/Makefile xsl/refdb/tei-refdb-xsl/tei-fo/Makefile xsl/refdb/tei-refdb-xsl/tei-html/Makefile xsl/refdb/tei-refdb-xsl/tei-lib/Makefile Makefile)
+AC_OUTPUT(src/Makefile scripts/Makefile cgi/Makefile etc/Makefile dtd/Makefile declarations/Makefile examples/Makefile styles/Makefile dsssl/Makefile dsssl/refdb/Makefile dsssl/refdb/html/Makefile dsssl/refdb/print/Makefile dsssl/refdb/lib/Makefile xsl/Makefile xsl/refdb/Makefile xsl/refdb/common-refdb/Makefile xsl/refdb/docbk-refdb-xsl/Makefile xsl/refdb/docbk-refdb-xsl/docbk-fo/Makefile xsl/refdb/docbk-refdb-xsl/docbk-html/Makefile xsl/refdb/docbk-refdb-xsl/docbk-xhtml/Makefile xsl/refdb/docbk-refdb-xsl/docbk-lib/Makefile xsl/refdb/tei-refdb-xsl/Makefile xsl/refdb/tei-refdb-xsl/tei-fo/Makefile xsl/refdb/tei-refdb-xsl/tei-html/Makefile xsl/refdb/tei-refdb-xsl/tei-lib/Makefile Makefile)
 
 echo

[Refdb-cvs] CVS: refdb configure.in,1.40,1.41

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv29189

Modified Files:
	configure.in 
Log Message:
support disabling client or server in etc

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -U2 -r1.40 -r1.41
--- configure.in	6 Jan 2004 18:11:33 -0000	1.40
+++ configure.in	6 Jan 2004 20:31:20 -0000	1.41
@@ -100,11 +100,15 @@
 
 if test "$ac_server" = "YES"; then
-server_subdirs="cgi doc etc examples scripts src"
+server_subdirs="cgi etc examples scripts src doc"
 server_bins="refdbd"
 server_scripts="refdb-bug refdbctl"
+server_etc_objects="refdbdrc.example"
+server_etc_distobjects="refdbdrc"
 else
 server_subdirs="doc"
 server_bins=""
 server_scripts=""
+server_etc_objects=""
+server_etc_distobjects=""
 fi
 
@@ -119,12 +123,18 @@
 client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
 client_scripts="refdbjade runbib tex2mail db2ris refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix"
+client_etc_objects="bib2risrc.example bib2riscgirc.example db2risrc.example nmed2risrc.example nmed2riscgirc.example refdbarc.example refdbcrc.example refdbcgirc.example refdbibrc.example med2risrc.example med2riscgirc.example marc2risrc.example"
+client_etc_distobjects="bib2risrc bib2riscgirc db2risrc nmed2risrc nmed2riscgirc refdbarc refdbcrc refdbcgirc refdbibrc med2risrc med2riscgirc marc2risrc"
 elif test "$ac_client" = "YES"; then
-client_subdirs="declarations doc dsssl dtd etc examples scripts src styles"
+client_subdirs="declarations dsssl dtd etc examples scripts src styles doc"
 client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
 client_scripts="refdbjade runbib tex2mail db2ris refdb-bug refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix"
+client_etc_objects="bib2risrc.example bib2riscgirc.example db2risrc.example nmed2risrc.example nmed2riscgirc.example refdbarc.example refdbcrc.example refdbcgirc.example refdbibrc.example med2risrc.example med2riscgirc.example marc2risrc.example"
+client_etc_distobjects="bib2risrc bib2riscgirc db2risrc nmed2risrc nmed2riscgirc refdbarc refdbcrc refdbcgirc refdbibrc med2risrc med2riscgirc marc2risrc"
 else
 client_subdirs=""
 client_bins=""
 client_scripts=""
+client_etc_objects=""
+client_etc_distobjects=""
 fi
 
@@ -262,4 +272,8 @@
 AC_SUBST(server_scripts)
 AC_SUBST(client_scripts)
+AC_SUBST(server_etc_objects)
+AC_SUBST(client_etc_objects)
+AC_SUBST(server_etc_distobjects)
+AC_SUBST(client_etc_distobjects)
 
 dnl Checks for header files.
@@ -311,4 +325,6 @@
 
 echo
+
+if test "$ac_client" = "YES"; then
 echo "Please check the above output for missing Perl modules. It is safe"
 echo "to make and make install anyway, but some of the Perl scripts will"
@@ -316,4 +332,6 @@
 echo "the manual where to get the modules from."
 echo
+fi
+
 echo "If you manage to compile (or even run) RefDB on a not yet supported"
 echo "platform or distribution, please do not hesitate to pride yourself"
@@ -322,6 +340,8 @@
 echo "maintainer <mho...@us...>. Thanks."
 echo
+
 echo "Your configuration:"
 echo "Database engine:" $db_server
+
 if test "$ac_client" = "YES"; then
 echo "will build clients"

[Refdb-cvs] CVS: refdb/etc Makefile.am,1.12,1.13

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv29048/etc

Modified Files:
	Makefile.am 
Log Message:
support disabling client or server

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/etc/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -U2 -r1.12 -r1.13
--- Makefile.am	16 Feb 2003 22:33:35 -0000	1.12
+++ Makefile.am	6 Jan 2004 20:30:53 -0000	1.13
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-objects = bib2risrc.example bib2riscgirc.example db2risrc.example nmed2risrc.example nmed2riscgirc.example refdbarc.example refdbcrc.example refdbcgirc.example refdbdrc.example refdbibrc.example med2risrc.example med2riscgirc.example marc2risrc.example
+objects = @client_etc_objects@ @server_etc_objects@
 
-distobjects = bib2risrc bib2riscgirc db2risrc nmed2risrc nmed2riscgirc refdbarc refdbcrc refdbcgirc refdbdrc refdbibrc med2risrc med2riscgirc marc2risrc
+distobjects = @client_etc_distobjects@ @server_etc_distobjects@
 
 EXTRA_DIST = $(distobjects)

[Refdb-cvs] CVS: refdb configure.in,1.39,1.40 Makefile.am,1.13,1.14

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv26908

Modified Files:
	configure.in Makefile.am 
Log Message:
added support for disabling clients or server

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -U2 -r1.39 -r1.40
--- configure.in	3 Jan 2004 20:07:05 -0000	1.39
+++ configure.in	6 Jan 2004 18:11:33 -0000	1.40
@@ -93,10 +93,49 @@
 ])
 
+dnl see whether we should build the server
+ac_server="YES"
+AC_ARG_ENABLE(server,
+	[  --disable-server		  Exclude server.],
+	[  ac_server="NO" ])
+
+if test "$ac_server" = "YES"; then
+server_subdirs="cgi doc etc examples scripts src"
+server_bins="refdbd"
+server_scripts="refdb-bug refdbctl"
+else
+server_subdirs="doc"
+server_bins=""
+server_scripts=""
+fi
+
+dnl see whether we should build the clients
+ac_client="YES"
+AC_ARG_ENABLE(clients,
+	[  --disable-clients		  Exclude clients.],
+	[  ac_client="NO" ])
+
+if test "$ac_client" = "YES" && test "$ac_server" = "YES"; then
+client_subdirs="declarations dsssl dtd styles"
+client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
+client_scripts="refdbjade runbib tex2mail db2ris refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix"
+elif test "$ac_client" = "YES"; then
+client_subdirs="declarations doc dsssl dtd etc examples scripts src styles"
+client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
+client_scripts="refdbjade runbib tex2mail db2ris refdb-bug refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix"
+else
+client_subdirs=""
+client_bins=""
+client_scripts=""
+fi
+
+
 dnl Checks for programs.
 AC_PROG_CC
+if test "$ac_client" = "YES"; then
 AC_PATH_PROGS(myjade, openjade jade)
 AC_PATH_PROGS(myshell, bash sh)
 AC_PATH_PROG(myperl, perl)
 AC_PATH_PROG(myxsltproc, xsltproc)
+fi
 
 dnl
@@ -104,4 +143,5 @@
 dnl
 
+if test "$ac_client" = "YES"; then
 dnl libtermcap; libreadline needs either libtermcap or lib(n)curses, so
 dnl we have to check this first
@@ -139,10 +179,12 @@
   AC_DEFINE(READLINE42)
 fi
+fi dnl end if build clients
 
+if test "$ac_server" = "YES"; then
 dnl linking with libdl is necessary on some systems
-AC_SEARCH_LIBS(dlopen, dl,,)
+AC_SEARCH_LIBS_VAR(dlopen, dl,,,,refdbd_LDADD)
 
 dnl linking with libltdl may be required by libdbi
-AC_SEARCH_LIBS(lt_dlopen, ltdl,,)
+AC_SEARCH_LIBS_VAR(lt_dlopen, ltdl,,,,refdbd_LDADD)
 
 dnl libdbi - depends on libdl on some systems
@@ -155,4 +197,6 @@
 AC_SEARCH_LIBS_VAR(compress, z, , , , refdbd_LDADD)
 
+fi dnl end if build server
+
 dnl linking with libsocket may be necessary (Solaris?)
 AC_SEARCH_LIBS(setsockopt, socket,,)
@@ -161,16 +205,19 @@
 AC_SEARCH_LIBS(gethostbyname, nsl,,)
 
-
 dnl libexpat
+if test "$ac_server" = "YES"; then
 AC_CHECK_LIB(expat, XML_ParserCreate, [
 refdbd_LDADD=$refdbd_LDADD" -lexpat"], [
 echo "Cannot build refdb without libexpat"
 exit 1])
+fi
 
 dnl btparse
+if test "$ac_client" = "YES"; then
 AC_CHECK_LIB(btparse, bt_initialize, [
 bib2ris_LDADD=$bib2ris_LDADD" -lbtparse"
 BIB2RIS="bib2ris\$(EXEEXT)"], [
 echo "libbtparse not found; bib2ris import filter will not be built"])
+fi
 
 dnl this is the dusty corner of configure and attempts to tackle the
@@ -209,4 +256,10 @@
 AC_SUBST(ULLSPEC)
 AC_SUBST(psarg)
+AC_SUBST(server_subdirs)
+AC_SUBST(client_subdirs)
+AC_SUBST(server_bins)
+AC_SUBST(client_bins)
+AC_SUBST(server_scripts)
+AC_SUBST(client_scripts)
 
 dnl Checks for header files.
@@ -228,4 +281,5 @@
 
 dnl Check for XSL stylesheets
+if test "$ac_client" = "YES"; then
 AC_CHECK_FILE($docbk_xsl/VERSION,
 [echo "DocBook XSL stylesheets found"],
@@ -247,4 +301,6 @@
 REFDB_PERL_MODULE($myperl, Text::Iconv, refdb_iconv)
 
+fi dnl end if build clients
+
 dnl Check for Emacs site-lisp folder NB we could do this here but
 dnl the Debian policy requires that packages should not depend on
@@ -266,2 +322,10 @@
 echo "maintainer <mho...@us...>. Thanks."
 echo
+echo "Your configuration:"
+echo "Database engine:" $db_server
+if test "$ac_client" = "YES"; then
+echo "will build clients"
+fi
+if test "$ac_server" = "YES"; then
+echo "will build server"
+fi

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -U2 -r1.13 -r1.14
--- Makefile.am	1 Jan 2004 05:54:14 -0000	1.13
+++ Makefile.am	6 Jan 2004 18:11:33 -0000	1.14
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = src scripts cgi etc dtd styles dsssl xsl examples declarations
+
+SUBDIRS = @client_subdirs@ @server_subdirs@
 
 EXTRA_DIST = autogen.sh UPGRADING

[Refdb-cvs] CVS: refdb/scripts Makefile.am,1.21,1.22

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv26908/scripts

Modified Files:
	Makefile.am 
Log Message:
added support for disabling clients or server

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -U2 -r1.21 -r1.22
--- Makefile.am	4 Nov 2003 23:23:11 -0000	1.21
+++ Makefile.am	6 Jan 2004 18:11:33 -0000	1.22
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-bin_SCRIPTS = refdbjade runbib tex2mail db2ris refdb-bug refdbxml refdbctl marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix
+EXTRA_SCRIPTS = refdbjade runbib tex2mail db2ris refdb-bug refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix refdbctl
+bin_SCRIPTS = @server_scripts@ @client_scripts@
 
 EXTRA_DIST=refdbjade.in runbib.in tex2mail db2ris.in refdb-bug.in refdbxml.in refdb.dump refdb.dump.pgsql refdb.dump.sqlite refdb refdbctl.in empty.mysql.dump empty.pgsql.dump.in refdb-upgrade.sql marc2ris.pl.in med2ris.pl.in en2ris.pl.in refdbnd.in vargen.pl libgen.pl dos2unix.in

[Refdb-cvs] CVS: refdb/src Makefile.am,1.18,1.19

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26908/src

Modified Files:
	Makefile.am 
Log Message:
added support for disabling clients or server

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/src/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -U2 -r1.18 -r1.19
--- Makefile.am	15 Dec 2003 23:28:06 -0000	1.18
+++ Makefile.am	6 Jan 2004 18:11:33 -0000	1.19
@@ -1,5 +1,6 @@
 ## Process this file with automake to produce Makefile.in
-EXTRA_PROGRAMS=bib2ris
-bin_PROGRAMS=refdbd refdbib refdbc refdba refdbxp nmed2ris eenc @BIB2RIS@
+
+EXTRA_PROGRAMS=refdbd refdbib refdbc refdba refdbxp nmed2ris eenc bib2ris
+bin_PROGRAMS= @server_bins@ @client_bins@ @BIB2RIS@
 BUILT_SOURCES=refdbd.h
 EXTRA_DIST=refdbd.h.in

[Refdb-cvs] CVS: refdb UPGRADING,1.6,1.7

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv26016

Modified Files:
	UPGRADING 
Log Message:
added initial blurb, fixed instruction titles

Index: UPGRADING
===================================================================
RCS file: /cvsroot/refdb/refdb/UPGRADING,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -U2 -r1.6 -r1.7
--- UPGRADING	31 Dec 2003 00:28:07 -0000	1.6
+++ UPGRADING	6 Jan 2004 18:07:30 -0000	1.7
@@ -1,7 +1,24 @@
-Migrating your existing RefDB installation from <0.9.4 to 0.9.4
-===============================================================
+RefDB UPGRADING
+===============
 
 $Id$
 
+This file contains instructions how to upgrade RefDB without losing
+your precious data. There is one section for each version that
+introduced backwards-incompatible changes requiring a rebuild of your
+databases:
+
+0.9.3 -> 0.9.4
+0.9/0.9.1/0.9.2 -> 0.9.3
+<0.9 -> 0.9
+
+Please visit the refdb-users mailing list archives for further hints
+on how to apply this information to pre-releases.
+
+
+
+Migrating your existing RefDB installation from 0.9.3 to 0.9.4
+===============================================================
+
 __________
 Background
@@ -27,6 +44,14 @@
 
 - While still running your existing installation, use the refdbc
-  command "getref -t risx -o dbname.xml :ID:>0" to dump your reference
-  databases to XML files.
+  command "getref -t ris -o dbname.ris :ID:>0" to dump your reference
+  databases to RIS files. Please note that this will export the
+  personal information of the current user only. If you share your
+  database with other users, you should re-run this command for each
+  user separately:
+  "set username otheruser"
+  "set passwd *"
+  "getref -t ris -o dbname-otheruser.ris -P :ID:>0". 
+  Using risx output is not recommended as the output
+  was not bug-free in 0.9.3.
 
 - Unless you kept copies of your bibliography styles in XML files,
@@ -43,10 +68,12 @@
 
 - Create new reference databases and read back your existing data
-  with the refdbc command "addref -t risx dbname.xml"
+  with the refdbc command "addref -t ris dbname.ris". If you have
+  dumps for other users as well, run "updateref -t ris -P -U otheruser
+  dbname-otheruser.ris" in turn for each user.
 
 
 
-Migrating your existing RefDB databases from <0.9.3 to 0.9.3
-============================================================
+Migrating your existing RefDB databases from 0.9/0.9.1/0.9.2 to 0.9.3
+=====================================================================
 
 __________
@@ -83,5 +110,5 @@
 
 
-Upgrading your existing RefDB installation from <0.9 to >=0.9
+Upgrading your existing RefDB installation from <0.9 to 0.9
 =============================================================
 

[Refdb-cvs] CVS: refdb/src tokenize.c,1.9,1.10

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25897

Modified Files:
	tokenize.c 
Log Message:
removed stripping of middlename string

Index: tokenize.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/tokenize.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -U2 -r1.9 -r1.10
--- tokenize.c	4 Nov 2003 23:41:21 -0000	1.9
+++ tokenize.c	6 Jan 2004 15:41:57 -0000	1.10
@@ -1046,7 +1046,4 @@
     stripwhite(ptr_atoken->first, 2, 0);
   }
-  if (*middle) {
-    stripwhite(middle, 2, 0);
-  }
   if (*(ptr_atoken->lineage)) {
     stripwhite(ptr_atoken->lineage, 2, 0);

[Refdb-cvs] CVS: refdb/src risdb.c,1.36,1.37

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25221

Modified Files:
	risdb.c 
Log Message:
strip whitespace off middlename string after assembly

Index: risdb.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risdb.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -U2 -r1.36 -r1.37
--- risdb.c	3 Jan 2004 20:11:44 -0000	1.36
+++ risdb.c	6 Jan 2004 15:39:21 -0000	1.37
@@ -703,4 +703,5 @@
 	    strncat(ptr_ainfo->middlename, " ", 255-strlen(ptr_ainfo->middlename));
 	  }
+	  stripwhite(ptr_ainfo->middlename, 2, 0);
 	}
 

[Refdb-cvs] CVS: refdb/src backend-risx.c,1.22,1.23 backendn-notex.c,1.6,1.7

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24773

Modified Files:
	backend-risx.c backendn-notex.c 
Log Message:
free header after call to assemble_header()

Index: backend-risx.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -U2 -r1.22 -r1.23
--- backend-risx.c	4 Jan 2004 01:55:50 -0000	1.22
+++ backend-risx.c	6 Jan 2004 15:37:13 -0000	1.23
@@ -66,7 +66,12 @@
 char* prepare_render_risx(struct renderinfo* ptr_rendinfo) {
   char* new_ref;
-
+  char* header;
   
-  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), assemble_header(ptr_rendinfo), ptr_rendinfo->ptr_ref_len);
+  if ((header = assemble_header(ptr_rendinfo)) == NULL) {
+    return NULL;
+  }
+
+  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len);
+  free(header);
 
   if (new_ref == NULL) {

Index: backendn-notex.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -U2 -r1.6 -r1.7
--- backendn-notex.c	4 Jan 2004 01:55:50 -0000	1.6
+++ backendn-notex.c	6 Jan 2004 15:37:13 -0000	1.7
@@ -56,6 +56,12 @@
 char* prepare_render_note_xnote(struct renderinfo* ptr_rendinfo) {
   char* new_ref;
+  char* header;
 
-  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), assemble_header(ptr_rendinfo), ptr_rendinfo->ptr_ref_len);
+  if ((header = assemble_header(ptr_rendinfo)) == NULL) {
+    return NULL;
+  }
+
+  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len);
+  free(header);
 
   if (new_ref == NULL) {

[Refdb-cvs] CVS: refdb/src refdbd.c,1.63,1.64

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv26326

Modified Files:
	refdbd.c 
Log Message:
added a couple of newlines to the output sent to the client

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -U2 -r1.63 -r1.64
--- refdbd.c	24 Dec 2003 21:44:53 -0000	1.63
+++ refdbd.c	4 Jan 2004 16:00:52 -0000	1.64
@@ -1210,5 +1210,5 @@
 
 	      /* summary for client */
-	      sprintf(child_returnmsg, "%d databases created", n_success);
+	      sprintf(child_returnmsg, "%d databases created\n", n_success);
 	    }
 
@@ -1229,5 +1229,5 @@
 
 	      /* summary for client */
-	      sprintf(child_returnmsg, "%d databases deleted", n_success);
+	      sprintf(child_returnmsg, "%d databases deleted\n", n_success);
 	    }
 
@@ -1334,5 +1334,5 @@
 		}
 		else {
-		  sprintf(child_returnmsg, ULLSPEC" datasets deleted, "ULLSPEC" skipped", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
+		  sprintf(child_returnmsg, ULLSPEC" datasets deleted, "ULLSPEC" skipped\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
 		}
 	      }
@@ -1342,5 +1342,5 @@
 		}
 		else {
-		  sprintf(child_returnmsg, ULLSPEC" datasets successfully deleted, "ULLSPEC" skipped, stopped after error", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
+		  sprintf(child_returnmsg, ULLSPEC" datasets successfully deleted, "ULLSPEC" skipped, stopped after error\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
 		}
 	      }
@@ -1384,5 +1384,5 @@
 		  }
 		  else {
-		    sprintf(child_returnmsg, ULLSPEC" datasets removed from personal reference list, "ULLSPEC" ignored", (unsigned long long)(delresult.success), (unsigned long long)(delresult.failure));
+		    sprintf(child_returnmsg, ULLSPEC" datasets removed from personal reference list, "ULLSPEC" ignored\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.failure));
 		  }
 		}
@@ -1392,5 +1392,5 @@
 		  }
 		  else {
-		    sprintf(child_returnmsg, ULLSPEC" datasets removed from personal interest list, stopped after error", (unsigned long long)(delresult.success));
+		    sprintf(child_returnmsg, ULLSPEC" datasets removed from personal interest list, stopped after error\n", (unsigned long long)(delresult.success));
 		  }
 		}
@@ -1402,5 +1402,5 @@
 		  }
 		  else {
-		    sprintf(child_returnmsg, ULLSPEC" datasets added to personal interest list, "ULLSPEC" ignored", (unsigned long long)(delresult.success), (unsigned long long)(delresult.failure));
+		    sprintf(child_returnmsg, ULLSPEC" datasets added to personal interest list, "ULLSPEC" ignored\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.failure));
 		  }
 		}
@@ -1410,5 +1410,5 @@
 		  }
 		  else {
-		    sprintf(child_returnmsg, ULLSPEC" datasets added to personal interest list, stopped after error", (unsigned long long)(delresult.success));
+		    sprintf(child_returnmsg, ULLSPEC" datasets added to personal interest list, stopped after error\n", (unsigned long long)(delresult.success));
 		  }
 		}
@@ -1478,8 +1478,8 @@
 	      /* let the client know what happened */
 	      if (n_success) {
-		sprintf(child_returnmsg, ULLSPEC" datasets deleted, "ULLSPEC" skipped", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
+		sprintf(child_returnmsg, ULLSPEC" datasets deleted, "ULLSPEC" skipped\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
 	      }
 	      else { /* if no success */
-		sprintf(child_returnmsg, ULLSPEC" datasets successfully deleted, "ULLSPEC" skipped, stopped after error", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
+		sprintf(child_returnmsg, ULLSPEC" datasets successfully deleted, "ULLSPEC" skipped, stopped after error\n", (unsigned long long)(delresult.success), (unsigned long long)(delresult.skipped));
 	      }
 	    }
@@ -1650,5 +1650,5 @@
 	      /* we don't really do anything here. The keyword scan runs
 		 after the client/server dialog is done */
-	      strcpy(child_returnmsg, "keyword scan scheduled");
+	      strcpy(child_returnmsg, "keyword scan scheduled\n");
 	    }
 

[Refdb-cvs] CVS: refdb/src refdbdref.c,1.48,1.49

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32206

Modified Files:
	refdbdref.c 
Log Message:
getref(): use database-derived encoding in rendinfo unless user overrides it

Index: refdbdref.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -U2 -r1.48 -r1.49
--- refdbdref.c	3 Jan 2004 20:11:44 -0000	1.48
+++ refdbdref.c	4 Jan 2004 01:58:20 -0000	1.49
@@ -3778,4 +3778,7 @@
   rendinfo.ptr_ref = &sql_command;
   rendinfo.ptr_ref_len = &sql_command_len;
+  if (!*(rendinfo.ptr_biblio_info->encoding)) {
+    rendinfo.ptr_biblio_info->encoding = dbi_conn_get_encoding(conn);
+  }
 
   if ((new_sql_command = prepare_render(&rendinfo)) == NULL) {

[Refdb-cvs] CVS: refdb/src refdbdnote.c,1.12,1.13

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32093

Modified Files:
	refdbdnote.c 
Log Message:
getnote(): use database-derived encoding in rendinfo unless user overrides it

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -U2 -r1.12 -r1.13
--- refdbdnote.c	3 Jan 2004 20:11:43 -0000	1.12
+++ refdbdnote.c	4 Jan 2004 01:57:31 -0000	1.13
@@ -1877,4 +1877,7 @@
   rendinfo.ptr_ref = &sql_command;
   rendinfo.ptr_ref_len = &sql_command_len;
+  if (!*(rendinfo.ptr_biblio_info->encoding)) {
+    rendinfo.ptr_biblio_info->encoding = dbi_conn_get_encoding(conn);
+  }
 
   if ((new_sql_command = prepare_render_note(&rendinfo)) == NULL) {

[Refdb-cvs] CVS: refdb/src backend.c,1.22,1.23 backend.h,1.21,1.22

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31958

Modified Files:
	backend.c backend.h 
Log Message:
new function assemble_header()

Index: backend.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -U2 -r1.22 -r1.23
--- backend.c	3 Jan 2004 20:11:43 -0000	1.22
+++ backend.c	4 Jan 2004 01:56:42 -0000	1.23
@@ -38,4 +38,5 @@
 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,
@@ -46,6 +47,69 @@
 };
 
+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  assemble_header(): assembles various html, xhtml, and XML headers
 
+  struct renderinfo* ptr_rendinfo ptr to a structure containing 
+                     information how the stuff is to be rendered
 
+  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+char* assemble_header(struct renderinfo* ptr_rendinfo) {
+  /* see whether the client specified a character encoding */
+  char enc_string[PREFS_BUF_LEN+80];
+  char* header;
+  size_t header_len = 1024;
+
+  if ((header = (char*)malloc(header_len)) == NULL) {
+    LOG_PRINT(LOG_WARNING, outomem.text);
+    return NULL;
+  }
+
+  *header = '\0';
+
+  switch (ptr_rendinfo->ref_format) {
+  case REFHTML:
+    /* fall through */
+  case REFXHTML:
+    /* html/xhtml output */
+    if (*(ptr_rendinfo->ptr_biblio_info->encoding)) {
+      snprintf(enc_string, PREFS_BUF_LEN+80, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", ptr_rendinfo->ptr_biblio_info->encoding);
+    }
+    else {
+      /* should never happen */
+      *enc_string = '\0';
+    }
+
+    if (*(ptr_rendinfo->cgi_url)) {
+      if (ptr_rendinfo->ref_format == REFHTML) {
+	snprintf(header, header_len, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
+      }
+      else { /* REFXHTML */
+	snprintf(header, header_len, "<?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>%s<title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /><link rel=\"stylesheet\" type=\"text/css\" href=\"%s\" />\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", ptr_rendinfo->ptr_biblio_info->encoding, enc_string, PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
+      }
+    }
+    else { /* don't use css */
+      if (ptr_rendinfo->ref_format == REFHTML) {
+	snprintf(header, header_len, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION);
+      }
+      else { /* REFXHTML */
+	snprintf(header, header_len, "<?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head>%s<title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /></head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", ptr_rendinfo->ptr_biblio_info->encoding, enc_string, PACKAGE, PACKAGE, VERSION);
+      }
+    }
+    break;
+  case RISX:
+    /* risx output */
+    snprintf(header, header_len, "<?xml version=\"1.0\" encoding=\"%s\"?>\n%s", ptr_rendinfo->ptr_biblio_info->encoding, RISX_PUBID);
+    break;
+  case XNOTE:
+    /* xnote output */
+    snprintf(header, header_len, "<?xml version=\"1.0\" encoding=\"%s\"?>\n%s", ptr_rendinfo->ptr_biblio_info->encoding, XNOTE_PUBID);
+    break;
+  default:
+    /* empty string */
+  }
+
+
+  return header;
+}
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Index: backend.h
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -U2 -r1.21 -r1.22
--- backend.h	24 Dec 2003 21:35:19 -0000	1.21
+++ backend.h	4 Jan 2004 01:56:42 -0000	1.22
@@ -36,5 +36,5 @@
   char* sort_string; /* specifies how to sort */
   char* xreflabel; /* label for sgml output */
-  char* encoding; /* character encoding of output */
+  const char* encoding; /* character encoding of output */
   const char* entry_id; /* id in sgml document */
   int is_subseq; /* 1 if this is a subsequent reference of the same authors */
@@ -150,4 +150,5 @@
 const char* get_author_type_string(dbi_driver driver, int type);
 int is_in_list(dbi_result dbires, char* username);
+char* assemble_header(struct renderinfo* ptr_rendinfo);
 
 dbi_result load_style(const char* pubtype, unsigned long long citstyle_id, dbi_conn conn);

[Refdb-cvs] CVS: refdb/src backend-html.c,1.21,1.22 backend-risx.c,1.21,1.22 backendn-html.c,1.3,1.4 backendn-notex.c,1.5,1.6

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31844

Modified Files:
	backend-html.c backend-risx.c backendn-html.c backendn-notex.c 
Log Message:
use assemble_header() to build appropriate header

Index: backend-html.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -U2 -r1.21 -r1.22
--- backend-html.c	25 Oct 2003 23:44:29 -0000	1.21
+++ backend-html.c	4 Jan 2004 01:55:50 -0000	1.22
@@ -60,4 +60,5 @@
   char* html_head;
   char* new_ref;
+  char* header;
 
   n_cgi = (ptr_rendinfo->ref_format == REFCGIHTML) ? 1:0;
@@ -90,29 +91,15 @@
   }
   else { /* not cgi */
-    /* see whether the client specified a character encoding */
-    char enc_string[PREFS_BUF_LEN+80];
+    if ((header = assemble_header(ptr_rendinfo)) == NULL) {
+      return NULL;
+    }
 
-    if (*(ptr_rendinfo->ptr_biblio_info->encoding)) {
-      sprintf(enc_string, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", ptr_rendinfo->ptr_biblio_info->encoding);
+    if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) {
+      free(header);
+      return NULL;
     }
     else {
-      *enc_string = '\0';
-    }
-
-    if (*(ptr_rendinfo->cgi_url)) {
-      if (ptr_rendinfo->ref_format == REFHTML) {
-	sprintf(*(ptr_rendinfo->ptr_ref), "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
-      }
-      else { /* REFXHTML */
-	sprintf(*(ptr_rendinfo->ptr_ref), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /><link rel=\"stylesheet\" type=\"text/css\" href=\"%s\" />\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
-      }
-    }
-    else { /* don't use css */
-      if (ptr_rendinfo->ref_format == REFHTML) {
-	sprintf(*(ptr_rendinfo->ptr_ref), "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n</head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION);
-      }
-      else { /* REFXHTML */
-	sprintf(*(ptr_rendinfo->ptr_ref), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /></head>\n<body>\n<h1 class='h1'>refdb reference list</h1>\n", PACKAGE, PACKAGE, VERSION);
-      }
+      *(ptr_rendinfo->ptr_ref) = new_ref;
+      free(header);
     }
   }

Index: backend-risx.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -U2 -r1.21 -r1.22
--- backend-risx.c	21 Dec 2003 22:59:34 -0000	1.21
+++ backend-risx.c	4 Jan 2004 01:55:50 -0000	1.22
@@ -67,14 +67,6 @@
   char* new_ref;
 
-  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), PROCESSING_INST_UTF8, ptr_rendinfo->ptr_ref_len);
-
-  if (new_ref == NULL) {
-    return NULL;
-  }
-  else {
-    *(ptr_rendinfo->ptr_ref) = new_ref;
-  }
-
-  new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), RISX_PUBID, ptr_rendinfo->ptr_ref_len, 0);
+  
+  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), assemble_header(ptr_rendinfo), ptr_rendinfo->ptr_ref_len);
 
   if (new_ref == NULL) {

Index: backendn-html.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backendn-html.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -U2 -r1.3 -r1.4
--- backendn-html.c	21 Dec 2003 23:04:42 -0000	1.3
+++ backendn-html.c	4 Jan 2004 01:55:50 -0000	1.4
@@ -47,39 +47,18 @@
  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 char* prepare_render_note_html(struct renderinfo* ptr_rendinfo) {
-  char enc_string[PREFS_BUF_LEN+80];
-  char buffer[1024];
   char* new_ref;
+  char* header;
 
-  /* write a header */
-  /* see whether the client specified a character encoding */
-  if (*(ptr_rendinfo->ptr_biblio_info->encoding)) {
-    sprintf(enc_string, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n", ptr_rendinfo->ptr_biblio_info->encoding);
-  }
-  else {
-    *enc_string = '\0';
-  }
-  
-  if (*(ptr_rendinfo->cgi_url)) {
-    if (ptr_rendinfo->ref_format == REFHTML) {
-      sprintf(buffer, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n<link rel=\"stylesheet\" type=\"text/css\" href=\"%s\">\n</head>\n<body>\n<h1 class='h1'>refdb notes list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
-    }
-    else { /* REFXHTML */
-      sprintf(*(ptr_rendinfo->ptr_ref), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /><link rel=\"stylesheet\" type=\"text/css\" href=\"%s\" />\n</head>\n<body>\n<h1 class='h1'>refdb notes list</h1>\n", PACKAGE, PACKAGE, VERSION, ptr_rendinfo->cgi_url);
-    }
-  }
-  else { /* don't use css */
-    if (ptr_rendinfo->ref_format == REFHTML) {
-      sprintf(*(ptr_rendinfo->ptr_ref), "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\">\n<html>\n<head>\n%s<title>%s reference list</title>\n<meta name=\"generator\" content=\"%s %s\">\n</head>\n<body>\n<h1 class='h1'>refdb notes list</h1>\n", enc_string, PACKAGE, PACKAGE, VERSION);
-    }
-    else { /* REFXHTML */
-      sprintf(*(ptr_rendinfo->ptr_ref), "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\"><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" /><title>%s reference list</title><meta name=\"generator\" content=\"%s %s\" id=\"generator\" /></head>\n<body>\n<h1 class='h1'>refdb notes list</h1>\n", PACKAGE, PACKAGE, VERSION);
-    }
+  if ((header = assemble_header(ptr_rendinfo)) == NULL) {
+    return NULL;
   }
 
-  if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), buffer, ptr_rendinfo->ptr_ref_len)) == NULL) {
+  if ((new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), header, ptr_rendinfo->ptr_ref_len)) == NULL) {
+    free(header);
     return NULL;
   }
   else {
     *(ptr_rendinfo->ptr_ref) = new_ref;
+    free(header);
     return *(ptr_rendinfo->ptr_ref);
   }

Index: backendn-notex.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -U2 -r1.5 -r1.6
--- backendn-notex.c	24 Dec 2003 21:41:14 -0000	1.5
+++ backendn-notex.c	4 Jan 2004 01:55:50 -0000	1.6
@@ -57,15 +57,5 @@
   char* new_ref;
 
-  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), PROCESSING_INST_UTF8, ptr_rendinfo->ptr_ref_len);
-
-  if (new_ref == NULL) {
-    return NULL;
-  }
-  else {
-    *(ptr_rendinfo->ptr_ref) = new_ref;
-  }
-
-  /* insert appropriate public identifier */
-  new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), XNOTE_PUBID, ptr_rendinfo->ptr_ref_len, 0);
+  new_ref = mstrcpy(*(ptr_rendinfo->ptr_ref), assemble_header(ptr_rendinfo), ptr_rendinfo->ptr_ref_len);
 
   if (new_ref == NULL) {

[Refdb-cvs] CVS: refdb/src backend-bibtex.c,1.14,1.15 backend-dbib.c,1.25,1.26 backend.c,1.21,1.22 noteshandler.c,1.9,1.10 refdbda.c,1.36,1.37 refdbdbib.c,1.28,1.29 refdbdnote.c,1.11,1.12 refdbdref.c,1.47,1.48 risdata.c,1.4,1.5 risdb.c,1.35,1.36 risxhandler.c,1.19,1.20 xmlhandler.c,1.20,1.21

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5871/src

Modified Files:
	backend-bibtex.c backend-dbib.c backend.c noteshandler.c 
	refdbda.c refdbdbib.c refdbdnote.c refdbdref.c risdata.c 
	risdb.c risxhandler.c xmlhandler.c 
Log Message:
reverted support for new libdbi API as that change was reverted as well

Index: backend-bibtex.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-bibtex.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -U2 -r1.14 -r1.15
--- backend-bibtex.c	28 Dec 2003 23:44:22 -0000	1.14
+++ backend-bibtex.c	3 Jan 2004 20:11:43 -0000	1.15
@@ -52,9 +52,4 @@
 static char* bibtexify_author(char** ptr_bibauthor, char* author);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
-
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -156,5 +151,5 @@
     /* retrieve basic information about the bibliography style from CITSTYLE into ptr_result */
     quoted_journal = mstrdup((ptr_rendinfo->ptr_biblio_info)->format_string);
-    if (!dbi_driver_quote_string_inplace(driver, &quoted_journal)) {
+    if (!dbi_driver_quote_string(driver, &quoted_journal)) {
       LOG_PRINT(LOG_WARNING, outomem.text);
       free(sql_command);

Index: backend-dbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -U2 -r1.25 -r1.26
--- backend-dbib.c	28 Dec 2003 23:44:22 -0000	1.25
+++ backend-dbib.c	3 Jan 2004 20:11:43 -0000	1.26
@@ -45,8 +45,4 @@
 static char* set_mset(char* current_mset, char* new_mset, char** ref, size_t* ptr_ref_len);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -86,5 +82,5 @@
   }
 
-  if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(conn), &myjournal) == -1) {
+  if (dbi_driver_quote_string(dbi_conn_get_driver(conn), &myjournal) == -1) {
     LOG_PRINT(LOG_WARNING, outomem.text);
     free(myjournal);
@@ -261,5 +257,5 @@
   }
 
-  if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) {
+  if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) {
     LOG_PRINT(LOG_WARNING, outomem.text);
     delete_all_lilimem(&sentinel);
@@ -893,5 +889,5 @@
   }
 
-  if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) {
+  if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn_refdb), &myjournal) == -1) {
     LOG_PRINT(LOG_WARNING, outomem.text);
     delete_all_lilimem(&sentinel);

Index: backend.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -U2 -r1.21 -r1.22
--- backend.c	26 Dec 2003 21:16:11 -0000	1.21
+++ backend.c	3 Jan 2004 20:11:43 -0000	1.22
@@ -47,9 +47,4 @@
 
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
-
 
 
@@ -2326,5 +2321,5 @@
     return -1;
   }
-  if (dbi_driver_quote_string_inplace(driver, &quoted_username) == -1) {
+  if (dbi_driver_quote_string(driver, &quoted_username) == -1) {
     free(quoted_username);
     free(sql_command);

Index: noteshandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -U2 -r1.9 -r1.10
--- noteshandler.c	26 Dec 2003 21:16:11 -0000	1.9
+++ noteshandler.c	3 Jan 2004 20:11:43 -0000	1.10
@@ -48,8 +48,4 @@
 static int set_notesdata_int_field(const char* field, unsigned long long n_value, dbi_conn conn, dbi_driver driver, unsigned long long n_note_id);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 
@@ -1050,5 +1046,5 @@
     return 1;
   }
-  if (dbi_driver_quote_string_inplace(driver, &quoted_value) == -1) {
+  if (dbi_driver_quote_string(driver, &quoted_value) == -1) {
     free(quoted_value);
     LOG_PRINT(LOG_WARNING, "malloc failed");
@@ -1175,5 +1171,5 @@
   /* quote target to make it usable for a SQL query */
   if ((quoted_target = strdup(target)) == NULL
-      || dbi_driver_quote_string_inplace(driver, &quoted_target) == -1) {
+      || dbi_driver_quote_string(driver, &quoted_target) == -1) {
     LOG_PRINT(LOG_WARNING, "malloc failed");
     free(sql_command);

Index: refdbda.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbda.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -U2 -r1.36 -r1.37
--- refdbda.c	28 Dec 2003 23:42:05 -0000	1.36
+++ refdbda.c	3 Jan 2004 20:11:43 -0000	1.37
@@ -82,8 +82,4 @@
 #endif
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -740,5 +736,5 @@
 
     /* escape any characters that the database server cannot digest */
-    if (dbi_driver_quote_string_inplace(driver, &myarg) == -1) {
+    if (dbi_driver_quote_string(driver, &myarg) == -1) {
       dbi_conn_close(conn);
       free(myarg);
@@ -804,5 +800,5 @@
 
     /* escape any characters that the database server cannot digest */
-    if (dbi_driver_quote_string_inplace(driver, &myarg) == -1) {
+    if (dbi_driver_quote_string(driver, &myarg) == -1) {
       dbi_conn_close(conn);
       free(myarg);
@@ -1580,5 +1576,5 @@
 
 	/* escape any characters that the database server cannot digest */
-	if (dbi_driver_quote_string_inplace(driver, &mytoken) == -1) {
+	if (dbi_driver_quote_string(driver, &mytoken) == -1) {
 	  free(mytoken);
 	  failed++;
@@ -1669,5 +1665,5 @@
 
     /* escape any characters that the database server cannot digest */
-    if (dbi_driver_quote_string_inplace(driver, &myarg) == -1) {
+    if (dbi_driver_quote_string(driver, &myarg) == -1) {
       if (ptr_clrequest->n_cgi) {
 	iwrite(ptr_clrequest->fd, cgihead_plain.text, cgihead_plain.length);

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -U2 -r1.28 -r1.29
--- refdbdbib.c	28 Dec 2003 23:44:22 -0000	1.28
+++ refdbdbib.c	3 Jan 2004 20:11:43 -0000	1.29
@@ -73,8 +73,4 @@
 static void close_dbi_connections(struct BIBCONNS* ptr_bibconns, const char* drivername);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -266,5 +262,5 @@
     }
 
-    if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(bibconns.conn_refdb), &myjournal) == -1) {
+    if (dbi_driver_quote_string(dbi_conn_get_driver(bibconns.conn_refdb), &myjournal) == -1) {
       LOG_PRINT(LOG_WARNING, outomem.text);
       delete_all_lilimem(&sentinel);
@@ -1176,5 +1172,5 @@
     }
 
-    if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(ptr_bibconns->conn), &authorlist_buffer) == -1) {
+    if (dbi_driver_quote_string(dbi_conn_get_driver(ptr_bibconns->conn), &authorlist_buffer) == -1) {
       iwrite(ptr_clrequest->fd, "", 1);
       if (!assemble_return_msg(ptr_addresult, noformatupdatecolon.text, ptr_bibconns->conn)) {
@@ -1621,5 +1617,5 @@
   }
 
-  if (dbi_driver_quote_string_inplace(driver, &myarg) == -1) {
+  if (dbi_driver_quote_string(driver, &myarg) == -1) {
     LOG_PRINT(LOG_WARNING, outomem.text);
     iwrite(ptr_clrequest->fd, outomem_n.text, outomem_n.length);
@@ -1693,5 +1689,5 @@
     }
 
-    if (dbi_driver_quote_string_inplace(driver, &myarg) == -1) {
+    if (dbi_driver_quote_string(driver, &myarg) == -1) {
       LOG_PRINT(LOG_WARNING, outomem.text);
       iwrite(ptr_clrequest->fd, outomem_n.text, outomem_n.length);

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -U2 -r1.11 -r1.12
--- refdbdnote.c	28 Dec 2003 23:44:22 -0000	1.11
+++ refdbdnote.c	3 Jan 2004 20:11:43 -0000	1.12
@@ -48,8 +48,4 @@
 extern int n_log_level; /* numeric version of log_level */
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -736,5 +732,5 @@
 		  break;
 		}
-		if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		  error = 1;
 		  break;
@@ -776,5 +772,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -843,5 +839,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -983,5 +979,5 @@
 		  break;
 		}
-		if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		  error = 1;
 		  break;
@@ -1023,5 +1019,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -1084,5 +1080,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -1223,5 +1219,5 @@
 		  break;
 		}
-		if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		  error = 1;
 		  break;
@@ -1263,5 +1259,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -1324,5 +1320,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -1498,5 +1494,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -1613,5 +1609,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -1789,5 +1785,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -2242,5 +2238,5 @@
       else {
 	if ((quoted_token = strdup(ptr_curr->value)) == NULL
-	    || dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    || dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	  iwrite(ptr_clrequest->fd, outomem_n.text, outomem_n.length);
 	  ptr_addresult->failure++;

Index: refdbdref.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -U2 -r1.47 -r1.48
--- refdbdref.c	28 Dec 2003 23:44:22 -0000	1.47
+++ refdbdref.c	3 Jan 2004 20:11:44 -0000	1.48
@@ -62,8 +62,4 @@
 static int real_run_keyword_scan(struct CLIENT_REQUEST* ptr_clrequest, Lilid* ptr_sentinel, int mode, int* ptr_insert);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2198,5 +2194,5 @@
 		  break;
 		}
-		if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		  error = 1;
 		  break;
@@ -2242,5 +2238,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -2315,5 +2311,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -2453,5 +2449,5 @@
 		  break;
 		}
-		if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		  error = 1;
 		  break;
@@ -2493,5 +2489,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -2560,5 +2556,5 @@
 		      break;
 		    }
-		    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+		    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 		      error = 1;
 		      break;
@@ -2733,5 +2729,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -2829,5 +2825,5 @@
 	    return 0;
 	  }
-	  if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	  if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	    dbi_conn_close(conn);
 	    delete_all_lilimem(&sentinel);
@@ -2942,5 +2938,5 @@
 	    return 0;
 	  }
-	  if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	  if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	    dbi_conn_close(conn);
 	    delete_all_lilimem(&sentinel);
@@ -2989,5 +2985,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -3113,5 +3109,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -3526,5 +3522,5 @@
 	      break;
 	    }
-	    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+	    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
 	      error = 1;
 	      break;
@@ -3641,5 +3637,5 @@
       return 0;
     }
-    if (dbi_driver_quote_string_inplace(driver, &quoted_token) == -1) {
+    if (dbi_driver_quote_string(driver, &quoted_token) == -1) {
       dbi_conn_close(conn);
       delete_all_lilimem(&sentinel);

Index: risdata.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risdata.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -U2 -r1.4 -r1.5
--- risdata.c	26 Dec 2003 21:16:12 -0000	1.4
+++ risdata.c	3 Jan 2004 20:11:44 -0000	1.5
@@ -31,8 +31,4 @@
 extern int n_log_level;
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -196,5 +192,5 @@
 
   /* escape any characters that the db cannot digest */
-  if (dbi_driver_quote_string_inplace(dbidrv, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(dbidrv, &escape_buffer) == -1) {
     free(escape_buffer);
     LOG_PRINT(LOG_WARNING, "malloc failed");
@@ -368,5 +364,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     free(escape_buffer);

Index: risdb.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risdb.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -U2 -r1.35 -r1.36
--- risdb.c	26 Dec 2003 21:16:12 -0000	1.35
+++ risdb.c	3 Jan 2004 20:11:44 -0000	1.36
@@ -55,9 +55,4 @@
 static int update_user_field(const char* fieldvalue, unsigned long long n_refdb_id, unsigned long long n_user_id, dbi_conn conn, dbi_driver driver, const char* query_stub, const char* errmsg);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
-
 
 
@@ -143,5 +138,5 @@
     strup(mytoken); /* convert token to uppercase */
 
-    if (dbi_driver_quote_string_inplace(dbi_conn_get_driver(conn), &mytoken) == -1) {
+    if (dbi_driver_quote_string(dbi_conn_get_driver(conn), &mytoken) == -1) {
       free(dest);
       free(mytoken);
@@ -910,5 +905,5 @@
 
 	/* escape any characters that the database server cannot digest */
-	if (dbi_driver_quote_string_inplace(driver, &(perinfo.full)) == -1) {
+	if (dbi_driver_quote_string(driver, &(perinfo.full)) == -1) {
 	  LOG_PRINT(LOG_WARNING, "out of memory");
 	  iwrite(ptr_clrequest->fd, "out of memory\n", 14);
@@ -927,5 +922,5 @@
 	}
 
-	if (dbi_driver_quote_string_inplace(driver, &(perinfo.custabbrev1)) == -1) {
+	if (dbi_driver_quote_string(driver, &(perinfo.custabbrev1)) == -1) {
 	  LOG_PRINT(LOG_WARNING, "out of memory");
 	  iwrite(ptr_clrequest->fd, "out of memory\n", 14);
@@ -944,5 +939,5 @@
 	}
 
-	if (dbi_driver_quote_string_inplace(driver, &(perinfo.custabbrev2)) == -1) {
+	if (dbi_driver_quote_string(driver, &(perinfo.custabbrev2)) == -1) {
 	  LOG_PRINT(LOG_WARNING, "out of memory");
 	  iwrite(ptr_clrequest->fd, "out of memory\n", 14);
@@ -965,5 +960,5 @@
 	dotify_journal(perinfo.abbrev, conn, conn_refdb);
 
-	if (dbi_driver_quote_string_inplace(driver, &(perinfo.abbrev)) == -1) {
+	if (dbi_driver_quote_string(driver, &(perinfo.abbrev)) == -1) {
 	  LOG_PRINT(LOG_WARNING, "out of memory");
 	  iwrite(ptr_clrequest->fd, "out of memory\n", 14);
@@ -2063,5 +2058,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     return 1;
@@ -2166,5 +2161,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     free(sql_command);
@@ -2228,5 +2223,5 @@
 
       /* escape any characters that the database server cannot digest */
-      if (dbi_driver_quote_string_inplace(driver, &another_escape_buffer) == -1) {
+      if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) {
 	LOG_PRINT(LOG_WARNING, "out of memory");
 	free(sql_command);
@@ -2283,5 +2278,5 @@
 
       /* escape any characters that the database server cannot digest */
-      if (dbi_driver_quote_string_inplace(driver, &another_escape_buffer) == -1) {
+      if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) {
 	LOG_PRINT(LOG_WARNING, "out of memory");
 	free(sql_command);
@@ -2338,5 +2333,5 @@
 
       /* escape any characters that the database server cannot digest */
-      if (dbi_driver_quote_string_inplace(driver, &another_escape_buffer) == -1) {
+      if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) {
 	LOG_PRINT(LOG_WARNING, "out of memory");
 	free(sql_command);
@@ -2393,5 +2388,5 @@
 
       /* escape any characters that the database server cannot digest */
-      if (dbi_driver_quote_string_inplace(driver, &another_escape_buffer) == -1) {
+      if (dbi_driver_quote_string(driver, &another_escape_buffer) == -1) {
 	LOG_PRINT(LOG_WARNING, "out of memory");
 	free(sql_command);
@@ -2477,5 +2472,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     free(sql_command);
@@ -2577,5 +2572,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     free(sql_command);
@@ -2663,5 +2658,5 @@
 
   /* escape any characters that the database server cannot digest */
-  if (dbi_driver_quote_string_inplace(driver, &escape_buffer) == -1) {
+  if (dbi_driver_quote_string(driver, &escape_buffer) == -1) {
     LOG_PRINT(LOG_WARNING, "out of memory");
     return 1;

Index: risxhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risxhandler.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -U2 -r1.19 -r1.20
--- risxhandler.c	28 Dec 2003 00:44:37 -0000	1.19
+++ risxhandler.c	3 Jan 2004 20:11:44 -0000	1.20
@@ -53,9 +53,4 @@
 
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
-
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -653,5 +648,5 @@
 	title_type = get_attr(ptr_ardata->ptr_first, "type");
 	if (title_type && !strcmp(title_type, "full")) {
-	  if (((ptr_ardata->perinfo).full = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string_inplace(ptr_ardata->driver, &((ptr_ardata->perinfo).full)) == -1) {
+	  if (((ptr_ardata->perinfo).full = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).full)) == -1) {
 	    if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) {
 	      (ptr_ardata->nmem_error)++;
@@ -666,5 +661,5 @@
 	}
 	else if (title_type && !strcmp(title_type, "abbrev")) {
-	  if (((ptr_ardata->perinfo).abbrev = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string_inplace(ptr_ardata->driver, &((ptr_ardata->perinfo).abbrev)) == -1) {
+	  if (((ptr_ardata->perinfo).abbrev = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).abbrev)) == -1) {
 	    if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) {
 	      (ptr_ardata->nmem_error)++;
@@ -679,5 +674,5 @@
 	}
 	else if (title_type && !strcmp(title_type, "custabbrev1")) {
-	  if (((ptr_ardata->perinfo).custabbrev1 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string_inplace(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev1)) == -1) {
+	  if (((ptr_ardata->perinfo).custabbrev1 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev1)) == -1) {
 	    if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) {
 	      (ptr_ardata->nmem_error)++;
@@ -692,5 +687,5 @@
 	}
 	else if (title_type && !strcmp(title_type, "custabbrev2")) {
-	  if (((ptr_ardata->perinfo).custabbrev2 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string_inplace(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev2)) == -1) {
+	  if (((ptr_ardata->perinfo).custabbrev2 = strdup((ptr_ardata->ptr_first)->ptr_elvalue)) == NULL || dbi_driver_quote_string(ptr_ardata->driver, &((ptr_ardata->perinfo).custabbrev2)) == -1) {
 	    if ((new_msgpool = mstrcat(ptr_ardata->msgpool, outomem_n.text, &(ptr_ardata->msgpool_len), 0)) == NULL) {
 	      (ptr_ardata->nmem_error)++;

Index: xmlhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/xmlhandler.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -U2 -r1.20 -r1.21
--- xmlhandler.c	28 Dec 2003 23:44:22 -0000	1.20
+++ xmlhandler.c	3 Jan 2004 20:11:44 -0000	1.21
@@ -56,9 +56,4 @@
 static char* get_ancestor_attr(struct elstack* ptr_current_element, char* ancestor_name, char* ancestor_attribute);
 
-/* libdbi changed the string quoting API after 0.7.0 */
-#ifndef HAVE_QUOTE_STRING_INPLACE
-#  define dbi_driver_quote_string_inplace dbi_driver_quote_string
-#endif
-
 
 /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1486,9 +1481,9 @@
 		my_refdb_startpage = my_dbi_result_get_string_copy(dbires, "refdb_startpage");
 		
-		/* the quote_string_inplace function checks for non-NULL arguments */
-		dbi_driver_quote_string_inplace(driver, &my_refdb_title);
-		dbi_driver_quote_string_inplace(driver, &my_refdb_volume);
-		dbi_driver_quote_string_inplace(driver, &my_refdb_issue);
-		dbi_driver_quote_string_inplace(driver, &my_refdb_startpage);
+		/* the quote_string function checks for non-NULL arguments */
+		dbi_driver_quote_string(driver, &my_refdb_title);
+		dbi_driver_quote_string(driver, &my_refdb_volume);
+		dbi_driver_quote_string(driver, &my_refdb_issue);
+		dbi_driver_quote_string(driver, &my_refdb_startpage);
 		
 		sprintf(sql_command, "INSERT INTO %s (article_title,volume,issue,startpage,pubyear) VALUES (%s,%s,%s,%s,%d)", ptr_gbdata->ptr_table_name, (my_refdb_title) ? my_refdb_title : "\'\'", (my_refdb_volume) ? my_refdb_volume : "\'\'", (my_refdb_issue) ? my_refdb_issue : "\'\'", (my_refdb_startpage) ? my_refdb_startpage : "\'\'", dbi_result_get_short(dbires, "refdb_pubyear"));

[Refdb-cvs] CVS: refdb configure.in,1.38,1.39

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv5465

Modified Files:
	configure.in 
Log Message:
removed dbi_driver_quote_string_inplace() check, bumped up version number

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -U2 -r1.38 -r1.39
--- configure.in	26 Dec 2003 21:19:23 -0000	1.38
+++ configure.in	3 Jan 2004 20:07:05 -0000	1.39
@@ -6,5 +6,5 @@
 
 dnl Use automake
-AM_INIT_AUTOMAKE(refdb, 0.9.4-pre3)
+AM_INIT_AUTOMAKE(refdb, 0.9.4-pre4)
 
 dnl Find out host type
@@ -151,11 +151,4 @@
 echo "Cannot build refdb without libdbi"
 exit 1])
-
-dnl check version of libdbi - older versions use string, newer string_inplace
-AC_SEARCH_LIBS_VAR(dbi_driver_quote_string_inplace, dbi, ac_dbi_have_inplace=1, , , dummy)
-
-if test "$ac_dbi_have_inplace" = "1" ; then
-   AC_DEFINE(HAVE_QUOTE_STRING_INPLACE)
-fi
 
 dnl compress is in glibc, but not in Cygwin newlib

[Refdb-cvs] CVS: refdb Makefile.am,1.12,1.13

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1:/tmp/cvs-serv4634

Modified Files:
	Makefile.am 
Log Message:
Removed site-lisp directory from build.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -U2 -r1.12 -r1.13
--- Makefile.am	26 Feb 2003 23:28:36 -0000	1.12
+++ Makefile.am	1 Jan 2004 05:54:14 -0000	1.13
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = src scripts site-lisp cgi etc dtd styles dsssl xsl examples declarations
+SUBDIRS = src scripts cgi etc dtd styles dsssl xsl examples declarations
 
 EXTRA_DIST = autogen.sh UPGRADING

[Refdb-cvs] CVS: refdb/site-lisp Makefile.am,1.4,NONE

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/refdb/site-lisp
In directory sc8-pr-cvs1:/tmp/cvs-serv28645/refdb/site-lisp

Removed Files:
	Makefile.am 
Log Message:
Moved refdb/site-lisp/Makefile.am to elisp/Makefile.am


--- Makefile.am DELETED ---

[Refdb-cvs] CVS: elisp Makefile.am,NONE,1.4

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/elisp
In directory sc8-pr-cvs1:/tmp/cvs-serv28362/elisp

Added Files:
      Tag: 1.4
	Makefile.am 
Log Message:
Moved refdb/site-lisp/Makefile.am to elisp/Makefile.am


--- NEW FILE ---
## $Id: Makefile.am,v 1.4 2003/12/31 07:18:36 xmldoc Exp $
## Process this file with automake to produce Makefile.in
EXTRA_DIST=ris.el

install-data-local:
	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/site-lisp
	$(INSTALL_DATA) ris.el $(DESTDIR)$(pkgdatadir)/site-lisp/ris.el

[Refdb-cvs] CVS: refdb/site-lisp ris.el,1.3,NONE

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/refdb/site-lisp
In directory sc8-pr-cvs1:/tmp/cvs-serv27431/refdb/site-lisp

Removed Files:
	ris.el 
Log Message:
Moved refdb/site-lisp/ris.el to elisp/ris.el


--- ris.el DELETED ---

[Refdb-cvs] CVS: elisp ris.el,NONE,1.3

[Michael S. <xm...@us...>]

Update of /cvsroot/refdb/elisp
In directory sc8-pr-cvs1:/tmp/cvs-serv26982/elisp

Added Files:
      Tag: 1.3
	ris.el 
Log Message:
Moved refdb/site-lisp/ris.el to elisp/ris.el


--- NEW FILE ---
;;; ris.el --- major mode for editing RIS bibliography files
;; $Id: ris.el,v 1.3 2003/12/31 07:08:55 xmldoc Exp $

;; Copyright (C) 2001  Markus Hoenicka

;; Author: Markus Hoenicka <ma...@mh...>
;; Keywords: bibliography ris

;; This file is NOT part of GNU Emacs.

;; This file is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.

;; This file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING.  If not, write to
;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.

;;; Commentary:

;; Still crude but works. This mode does not attempt to validate the RIS
;; data but provides some convenience for editing RIS datasets.
;;
;; To install this mode, move this file somewhere into your load-path
;; (something like /usr/local/share/emacs/site-lisp), and
;; byte-compile-file it.
;;
;; To load the mode automatically at startup and to associate .ris
;; files with this mode, put the following code into your .emacs
;; (or site-start.el):
;; ---8<-------------------------------
;; ;; Turn on syntax coloring
;; (cond ((fboundp 'global-font-lock-mode)
;;       ;; Turn on font-lock in all modes that support it
;;       (global-font-lock-mode t)
;;       ;; maximum colors
;;       (setq font-lock-maximum-decoration t)))
;;
;; ;; ris mode
;; (autoload 'ris-mode "ris" "Major mode for RIS bibliography files." t)
;; (or (assoc "\\.ris$" auto-mode-alist)
;;     (setq auto-mode-alist (cons '("\\.ris$" . ris-mode)
;; 				auto-mode-alist)))
;; ---8<-------------------------------

;;; Code:

; prepare font-locking
(make-face 'ris-main-face)
(make-face 'ris-tag-face)
(make-face 'ris-tyer-tag-face)
(set-face-foreground 'ris-main-face "maroon")
(set-face-foreground 'ris-tag-face "blue")
(set-face-foreground 'ris-tyer-tag-face "red")

(defvar ris-font-lock-keywords
  '(("^\\(ID\\|T1\\|TI\\|CT\\|BT\\|A1\\|AU\\|Y1\\|PY\\|N1\\|AB\\|KW\\|RP\\|SP\\|EP\\|JF\\|JO\\|JA\\|J1\\|J2\\|VL\\|T2\\|A2\\|ED\\|IS\\|CP\\|CY\\|PB\\|U1\\|U2\\|U3\\|U4\\|U5\\|T3\\|A3\\|N2\\|SN\\|AV\\|Y2\\|M1\\|M2\\|M3\\|AD\\|UR\\)  - \\(.+\\)" 2 'ris-main-face t)
    ("^\\(\\(ID\\|T1\\|TI\\|CT\\|BT\\|A1\\|AU\\|Y1\\|PY\\|N1\\|AB\\|KW\\|RP\\|SP\\|EP\\|JF\\|JO\\|JA\\|J1\\|J2\\|VL\\|T2\\|A2\\|ED\\|IS\\|CP\\|CY\\|PB\\|U1\\|U2\\|U3\\|U4\\|U5\\|T3\\|A3\\|N2\\|SN\\|AV\\|Y2\\|M1\\|M2\\|M3\\|AD\\|UR\\)  - \\)\\(.+\\)" 1 'ris-tag-face t)
    ("^\\(TY  - \\(ABST\\|ADVS\\|ART\\|BILL\\|BOOK\\|CASE\\|CHAP\\|COMP\\|CONF\\|CTLG\\|DATA\\|ELEC\\|GEN\\|HEAR\\|ICOMM\\|INPR\\|JFULL\\|JOUR\\|MAP\\|MGZN\\|MPCT\\|MUSIC\\|NEWS\\|PAMP\\|PAT\\|PCOMM\\|RPRT\\|SER\\|SLIDE\\|SOUND\\|STAT\\|THES\\|UNBILL\\|UNPB\\|VIDEO\\)\\)$\\|^\\(ER  - \\)$" 0 'ris-tyer-tag-face t))
  "Keyword highlighting specification for `ris-mode'.")


(require 'derived)

;;;###autoload
(define-derived-mode ris-mode fundamental-mode "RIS"
  "A major mode for editing RIS bibliography files."
  (set (make-local-variable 'font-lock-defaults)
       '(ris-font-lock-keywords))
  (set (make-local-variable 'page-delimiter) "^$")
)

(defun duplicate-tag ()
  "Create new line below the current one with the same tag as the current one."
  (interactive "*")
  (let ((start-point (point-marker)))
    (beginning-of-line)
    (if (string= (buffer-substring (+ (point-marker) 2) (+ (point-marker) 6)) "  - ")
	(let ((tag-start (point-marker)))
	  (end-of-line)
	  (newline)
	  (insert-buffer-substring (current-buffer) tag-start (+ tag-start 6)))
      (goto-char start-point)))
)

(defun insert-tag ()
  "Create a new tag from two user-supplied characters."
  (interactive "*")
  (let ((tag-string (completing-read "Tag:" '(("TY  - " 1)
				    ("ER  - " 2)
				    ("ID  - " 3)
				    ("TI  - " 4)
				    ("CT  - " 5)
				    ("BT  - " 6)
				    ("A1  - " 7)
				    ("AU  - " 8)
				    ("Y1  - " 9)
				    ("PY  - " 10)
				    ("N1  - " 11)
				    ("AB  - " 12)
				    ("KW  - " 13)
				    ("RP  - " 14)
				    ("SP  - " 15)
				    ("EP  - " 16)
				    ("JF  - " 17)
				    ("JO  - " 18)
				    ("JA  - " 19)
				    ("J1  - " 20)
				    ("J2  - " 21)
				    ("VL  - " 22)
				    ("T2  - " 23)
				    ("A2  - " 24)
				    ("ED  - " 25)
				    ("IS  - " 26)
				    ("CP  - " 27)
				    ("CY  - " 28)
				    ("PB  - " 29)
				    ("U1  - " 30)
				    ("U2  - " 31)
				    ("U3  - " 32)
				    ("U4  - " 33)
				    ("U5  - " 34)
				    ("T3  - " 35)
				    ("A3  - " 36)
				    ("N2  - " 37)
				    ("SN  - " 38)
				    ("AV  - " 39)
				    ("Y2  - " 40)
				    ("M1  - " 41)
				    ("M2  - " 42)
				    ("M3  - " 43)
				    ("AD  - " 44)
				    ("UR  - " 45)) nil t))) 
    (message (char-to-string (char-before)))
    (if (not (equal (char-before) 10))
	(progn
	  (end-of-line)
	  (newline)))
    (insert tag-string))
)

(defun insert-set ()
  "Create a new skeleton RIS dataset."
  (interactive "*")
  (let ((set-type (completing-read "Type:" '(("ABST" 1)
					     ("ADVS" 2)
					     ("ART" 3)
					     ("BILL" 4)
					     ("BOOK" 5)
					     ("CASE" 6)
					     ("CHAP" 7)
					     ("COMP" 8)
					     ("CONF" 9)
					     ("CTLG" 10)
					     ("DATA" 11)
					     ("ELEC" 12)
					     ("GEN" 13)
					     ("HEAR" 14)
					     ("ICOMM" 15)
					     ("INPR" 16)
					     ("JFULL" 17)
					     ("JOUR" 18)
					     ("MAP" 19)
					     ("MGZN" 20)
					     ("MPCT" 21)
					     ("MUSIC" 22)
					     ("NEWS" 23)
					     ("PAMP" 24)
					     ("PAT" 25)
					     ("PCOMM" 26)
					     ("RPRT" 27)
					     ("SER" 28)
					     ("SLIDE" 29)
					     ("SOUND" 30)
					     ("STAT" 31)
					     ("THES" 32)
					     ("UNBILL" 33)
					     ("UNPB" 34)
					     ("VIDEO" 35)) nil t)))

    (if (not (or (equal (char-before) 10) (equal (char-before) nil)))
	(progn
	  (end-of-line)
	  (newline)))
    (newline)
    (let ((start-point (point-marker)))
      (insert "TY  - " set-type "\nER  - \n")
      (goto-char start-point)
      (end-of-line)
      (newline))
))

; define aliases to better match what the commands do
(defalias 'backward-set 'backward-page)
(defalias 'forward-set 'forward-page)
(defalias 'narrow-to-set 'narrow-to-page)

(define-key ris-mode-map "\C-x[" 'backward-set)
(define-key ris-mode-map "\C-x]" 'forward-set)
(define-key ris-mode-map "\C-xns" 'narrow-to-set)
(define-key ris-mode-map "\M-\r" 'duplicate-tag)
(define-key ris-mode-map "\C-c\C-t" 'insert-tag)
(define-key ris-mode-map "\C-c\C-s" 'insert-set)

(provide 'ris)
;;; ris.el ends here

[Refdb-cvs] CVS: perlmod/RefDBClient Client.pm,1.7,1.8

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/perlmod/RefDBClient
In directory sc8-pr-cvs1:/tmp/cvs-serv9278

Modified Files:
	Client.pm 
Log Message:
added functions to manage extended notes

Index: Client.pm
===================================================================
RCS file: /cvsroot/refdb/perlmod/RefDBClient/Client.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -U2 -r1.7 -r1.8
--- Client.pm	25 Jun 2003 20:47:33 -0000	1.7
+++ Client.pm	31 Dec 2003 01:22:19 -0000	1.8
@@ -529,4 +529,47 @@
 
 ######################################################################
+## _addnote(): adds or updates notes
+######################################################################
+sub _addnote {
+    my ($self, $cmd, $xnotedata) = @_;
+
+    syswrite($self->{socket}, $cmd . "\x00");
+
+    my $result;
+    my @all_results;
+
+    while (defined(my $inbuffer = $self->_tread(OUTBUF_LEN))) {
+	$result .= $inbuffer;
+	if ($result =~ /\x00/) {
+	    last;
+	}
+    }
+
+    unless (substr($result, 0, 3) eq "POS") {
+	print $result . "\n";
+	return;
+    }
+
+    push (@all_results, $self->_send_xml($xnotedata));
+
+    # Phase 5: signal server that we're done
+    syswrite($self->{socket}, "QUIT\x00");
+
+    $result = undef;
+    while (defined(my $inbuffer = $self->_tread(OUTBUF_LEN))) {
+	$result .= $inbuffer;
+	if ($inbuffer =~ s/\x00//) {
+	    last;
+	}
+    }
+    #print $result . "\n";
+    push (@all_results, $result);
+    
+    syswrite($self->{socket}, "POS\x00");
+
+    @all_results;
+}
+
+######################################################################
 ## _send_xml(): helper to send XML data to the server
 ######################################################################
@@ -1036,5 +1079,5 @@
 Title   : refdb_addref
 
-Usage   : @result = $client->refdb_addref($owner, $is_personal, $risdata);
+Usage   : @result = $client->refdb_addref($owner, $risdata, $type);
 
 Function: adds references to the database
@@ -1166,4 +1209,178 @@
 }
 
+=head2 refdb_addnote
+
+Title   : refdb_addnote
+
+Usage   : @result = $client->refdb_addnote($owner, $xnotedata, $type);
+
+Function: adds notes to the database
+
+=cut
+
+######################################################################
+## refdb_addnote(): adds extended notes to the database
+######################################################################
+sub refdb_addnote {
+    my ($self, $owner, $xnotedata, $type) = @_;
+
+    $self->_init_dialog();
+
+    my $cmd = "addnote -d $self->{db} ";
+
+    if (length($self->{username}) > 0) {
+	$cmd .= "-u $self->{username} ";
+    }
+
+    if (length($self->{numberized_passwd}) > 0) {
+	$cmd .= "-w $self->{numberized_passwd} ";
+    }
+
+    if (length($owner) > 0) {
+	$cmd .= "-U $owner ";
+    }
+
+    $cmd .= "-s $type";
+
+    # return result as a list of lines
+    $self->_addnote($cmd, $xnotedata);
+}
+
+=head2 refdb_updatenote
+
+Title   : refdb_updatenote
+
+Usage   : @result = $client->refdb_updatenote($owner, $is_personal, $xnotedata);
+
+Function: updates references in the database
+
+=cut
+
+######################################################################
+## refdb_updatenote(): updates notes in the database
+######################################################################
+sub refdb_updatenote {
+    my ($self, $owner, $is_personal, $xnotedata, $type) = @_;
+
+    my $cmd = "updatenote -d $self->{db} ";
+
+    $self->_init_dialog();
+
+    if (length($self->{username}) > 0) {
+	$cmd .= "-u $self->{username} ";
+    }
+
+    if (length($self->{numberized_passwd}) > 0) {
+	$cmd .= "-w $self->{numberized_passwd} ";
+    }
+
+    if (length($owner) > 0) {
+	$cmd .= "-U $owner ";
+    }
+
+    if ($is_personal eq "t") {
+	$cmd .= "-p ";
+    }
+
+    $cmd .= "-s $type";
+
+    # return result as a list of lines
+    $self->_addnote($cmd, $xnotedata);
+}
+
+=head2 refdb_deletenote
+
+Title   : refdb_deletenote
+
+Usage   : @result = $client->refdb_deletenote($ids);
+
+Function: deletes notes from the database
+
+=cut
+
+######################################################################
+## refdb_deletenote(): deletes notes from the database
+######################################################################
+sub refdb_deletenote {
+    my ($self, $arg) = @_;
+
+    my $cmd = "deletenote -d $self->{db} ";
+
+    $self->_init_dialog();
+
+    if (length($self->{username}) > 0) {
+	$cmd .= "-u $self->{username} ";
+    }
+
+    if (length($self->{numberized_passwd}) > 0) {
+	$cmd .= "-w $self->{numberized_passwd} ";
+    }
+
+    my $arglength = length($arg) + 1;
+
+    syswrite($self->{socket}, $cmd . " $arglength\x00");
+
+    my $result;
+
+    while (defined(my $inbuffer = $self->_tread(OUTBUF_LEN))) {
+	$result .= $inbuffer;
+	if ($result =~ /\x00/) {
+	    last;
+	}
+    }
+
+    unless (substr($result, 0, 3) eq "POS") {
+	print $result . "\n";
+	return;
+    }
+
+    my $sl = new RefDBClient::Simplelist;
+
+    $sl->{cmd} = $arg;
+
+    # return the result as a list of lines
+    split /\n/, $self->_getsimplelist($sl);
+}
+
+=head2 refdb_addlink
+
+Title   : refdb_addlink
+
+Usage   : @result = $client->refdb_addlink($remove, $linkspec);
+
+Function: links notes to database objects
+
+=cut
+
+######################################################################
+## refdb_addlink(): links notes to database objects
+######################################################################
+sub refdb_addlink {
+    my ($self, $remove, $arg) = @_;
+
+    $self->_init_dialog();
+
+    my $sl = new RefDBClient::Simplelist;
+
+    $sl->{cmd} = "addlink -d $self->{db} ";
+
+    if (length($self->{username}) > 0) {
+	$sl->{cmd} .= "-u $self->{username} ";
+    }
+
+    if (length($self->{numberized_passwd}) > 0) {
+	$sl->{cmd} .= "-w $self->{numberized_passwd} ";
+    }
+
+    if ($remove) {
+	$sl->{cmd} .= "-r ";
+    }
+
+    $sl->{cmd} .= "\"" . $arg . "\"";
+
+    # return the result as a list of lines
+    split /\n/, $self->_getsimplelist($sl);
+}
+
 =head2 refdb_getas
 
@@ -1453,4 +1670,47 @@
     # return the result as a list of lines
     split /\n/, $self->_getsimplelist($sl);
+}
+
+=head2 refdb_getref
+
+Title   : refdb_getref
+
+Usage   : @result = $client->refdb_getref($type, $format_string, $sort_string, $query_string);
+
+Function: retrieves references
+
+=cut
+
+######################################################################
+## refdb_getnote(): retrieves notes
+######################################################################
+sub refdb_getnote {
+    my ($self, $type, $format_string, $sort_string, $arg) = @_;
+
+    my $cmd = "getnote -d $self->{db} ";
+
+    if (length($type) > 0) {
+	$cmd .= "-t $type ";
+    }
+    
+    if (length($format_string) > 0) {
+	$cmd .= "-s \"$format_string\" ";
+    }
+    
+    if (length($sort_string) > 0) {
+	$cmd .= "-S $sort_string ";
+    }
+    
+    if (length($self->{pdf_root}) > 0) {
+	$cmd .= "-R $self->{pdf_root} ";
+    }
+    
+    if (length($self->{css_url}) > 0) {
+	$cmd .= "-G $self->{css_url} ";
+    }
+    
+    $cmd .= $arg;
+
+    $self->_listvalue($cmd);
 }
 

[Refdb-cvs] CVS: perlmod/RefDBClient test.pl,1.5,1.6

[Markus H. <mho...@us...>]

Update of /cvsroot/refdb/perlmod/RefDBClient
In directory sc8-pr-cvs1:/tmp/cvs-serv9186

Modified Files:
	test.pl 
Log Message:
added tests for extended note functionality

Index: test.pl
===================================================================
RCS file: /cvsroot/refdb/perlmod/RefDBClient/test.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -U2 -r1.5 -r1.6
--- test.pl	29 May 2003 10:37:54 -0000	1.5
+++ test.pl	31 Dec 2003 01:21:54 -0000	1.6
@@ -7,19 +7,12 @@
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-BEGIN { $| = 1; print "1..21\n"; }
-END {print "not ok 1\n" unless $loaded;}
+BEGIN { $| = 1; print "0..25\n"; }
+END {print "not ok 0\n" unless $loaded;}
 use RefDBClient::Client;
 $loaded = 1;
-print "ok 1\n";
+print "ok 0\n";
 
 ######################### End of black magic.
 
-###
-### Please comment out the following "print" and "exit" commands after
-### setting the initial connection parameters below
-###
-#print "This is not your usual Perl module test. Please edit test.pl and set the initial connection parameters before trying again. Sorry for the inconvenience, will be fixed eventually\n";
-#exit;
-
 # set a few initial params
 my $auser = "root";          # must match your database server
@@ -69,4 +62,5 @@
 my $numtest = 1;
 my $numok = 1;
+my $numtotal =25;
 
 # we need two clients for the refdba and refdbc functions as the
@@ -81,6 +75,6 @@
 $clientc->set_conninfo($server_ip, $port, $cuser, $cpasswd, "", "/home/testuser/literature", "/usr/local/share/refdb/css/refdb.css");
 
-# start next test
-print "2..21: ";
+# run the refdba:viewstat command to test the connection
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -91,6 +85,6 @@
 }
 
-# start next test
-print "3..21: ";
+# add a bibliography style to the database
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -108,6 +102,6 @@
 }
 
-# start next test
-print "4..21: ";
+# see whether the new style appears in the style list
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -118,6 +112,6 @@
 }
 
-# start next test
-print "5..21: ";
+# retrieve the style again
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -128,6 +122,6 @@
 }
 
-# start next test
-print "6..21: ";
+# create a new reference database
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -138,6 +132,6 @@
 }
 
-# start next test
-print "7..21: ";
+# add a user
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -148,6 +142,6 @@
 }
 
-# start next test
-print "8..21: ";
+# select the new database
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -158,6 +152,6 @@
 }
 
-# start next test
-print "9..21: ";
+# add RIS datasets
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -172,6 +166,6 @@
 }
 
-# start next test
-print "10..21: ";
+# add risx datasets
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -190,6 +184,34 @@
 }
 
-# start next test
-print "11..21: ";
+# add xnote datasets
+print "$numtest..$numtotal: ";
+$numtest++;
+
+my $xnotestring;
+
+open IN, "< testdata/xnoteset.xml";
+while (<IN>) {
+    $xnotestring .= $_;
+}
+close IN;
+
+@result = $clientc->refdb_addnote(undef, $xnotestring, "xnote");
+
+foreach $line (@result) {
+    print $line . "\n";
+}
+
+# add link
+print "$numtest..$numtotal: ";
+$numtest++;
+
+@result = $clientc->refdb_addlink(0, ":NID:=1 :CK:=MILLER1999");
+
+foreach $line (@result) {
+    print $line . "\n";
+}
+
+# retrieve references
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -200,6 +222,16 @@
 }
 
-# start next test
-print "12..21: ";
+# retrieve notes
+print "$numtest..$numtotal: ";
+$numtest++;
+
+@result = $clientc->refdb_getnote("xnote", "AB", undef, ":ID:=1");
+
+foreach $line (@result) {
+    print $line . "\n";
+}
+
+# use the refdbc:whichdb command to see the total number of refs
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -210,6 +242,6 @@
 }
 
-# start next test
-print "13..21: ";
+# test the refdbc:listdb command to list available databases
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -220,6 +252,6 @@
 }
 
-# start next test
-print "14..21: ";
+# create a bibliography from a TeX document (or rather, from the .aux file)
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -233,6 +265,6 @@
 }
 
-# start next test
-print "15..21: ";
+# create a formatted bibliography
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -251,6 +283,6 @@
 }
 
-# start next test
-print "16..21: ";
+# get journal names
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -261,6 +293,6 @@
 }
 
-# start next test
-print "17..21: ";
+# remove the user
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -271,6 +303,26 @@
 }
 
-# start next test
-print "18..21: ";
+# delete link
+print "$numtest..$numtotal: ";
+$numtest++;
+
+@result = $clientc->refdb_addlink(1, ":NID:=1 :CK:=MILLER1999");
+
+foreach $line (@result) {
+    print $line . "\n";
+}
+
+# delete notes
+print "$numtest..$numtotal: ";
+$numtest++;
+
+@result = $clientc->refdb_deletenote("1");
+
+foreach $line (@result) {
+    print $line . "\n";
+}
+
+# delete references
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -281,6 +333,6 @@
 }
 
-# start next test
-print "19..21: ";
+# delete the test database
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -291,6 +343,6 @@
 }
 
-# start next test
-print "20..21: ";
+# add reserved journal words to the system database
+print "$numtest..$numtotal: ";
 $numtest++;
 
@@ -301,6 +353,6 @@
 }
 
-# start next test
-print "21..21: ";
+# remove the reserved journal words again
+print "$numtest..$numtotal: ";
 $numtest++;