refdb-cvs — All cvs checkins go to this list

[Refdb-cvs] CVS: refdb/etc refdbcrc,1.5,1.6 refdbdrc,1.9,1.10

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

Update of /cvsroot/refdb/refdb/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20161

Modified Files:
	refdbcrc refdbdrc 
Log Message:
added encoding-related variables

Index: refdbcrc
===================================================================
RCS file: /cvsroot/refdb/refdb/etc/refdbcrc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -U2 -r1.5 -r1.6
--- refdbcrc	3 Sep 2003 22:39:21 -0000	1.5
+++ refdbcrc	25 Jan 2004 01:08:31 -0000	1.6
@@ -77,7 +77,11 @@
 cssurl <pkgdatadir>/css/refdb.css
 
+# The character encoding that should be used for RIS input
+fromencoding ISO-8859-1
+
 # The character encoding that should be used for the output of the
-# getref command. Keep in mind that not all backends honor this setting
-# encoding UTF-8
+# getref command. If this value is not set, the encoding of the database
+# will be used without conversion
+#toencoding UTF-8
 
 # end of refdbcrc

Index: refdbdrc
===================================================================
RCS file: /cvsroot/refdb/refdb/etc/refdbdrc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -U2 -r1.9 -r1.10
--- refdbdrc	30 Dec 2003 23:56:36 -0000	1.9
+++ refdbdrc	25 Jan 2004 01:08:32 -0000	1.10
@@ -94,4 +94,7 @@
 db_encoding	UNICODE
 
+# Specify the default encoding of imported RIS data.
+in_encoding	ISO-8859-1
+
 # Set this to t if you want refdbd to uppercase citation keys when
 # adding datasets. This is convenient to make sure your datasets work

[Refdb-cvs] CVS: refdb configure.in,1.45,1.46

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

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26570

Modified Files:
	configure.in 
Log Message:
added EXEEXT to the binaries to make things workon Cygwin

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -U2 -r1.45 -r1.46
--- configure.in	25 Jan 2004 19:34:12 -0000	1.45
+++ configure.in	26 Jan 2004 21:22:10 -0000	1.46
@@ -101,5 +101,5 @@
 if test "$ac_server" = "YES"; then
 server_subdirs="cgi etc examples scripts src doc"
-server_bins="refdbd"
+server_bins="refdbd\$(EXEEXT)"
 server_scripts="refdb-bug refdbctl"
 server_etc_objects="refdbdrc.example"
@@ -121,5 +121,5 @@
 if test "$ac_client" = "YES" && test "$ac_server" = "YES"; then
 client_subdirs="declarations dsssl dtd styles xsl"
-client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
+client_bins="refdbib\$(EXEEXT) refdbc\$(EXEEXT) refdba\$(EXEEXT) refdbxp\$(EXEEXT) nmed2ris\$(EXEEXT) eenc\$(EXEEXT)"
 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"

[Refdb-cvs] CVS: refdb/src backend.c,1.24,1.25

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23589

Modified Files:
	backend.c 
Log Message:
removed a default that caused a warning

Index: backend.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -U2 -r1.24 -r1.25
--- backend.c	8 Jan 2004 20:50:17 -0000	1.24
+++ backend.c	25 Jan 2004 13:17:02 -0000	1.25
@@ -105,5 +105,5 @@
     snprintf(header, header_len, "<?xml version=\"1.0\" encoding=\"%s\"?>\n%s", ptr_rendinfo->ptr_biblio_info->encoding, XNOTE_PUBID);
     break;
-  default:
+/*   default: */
     /* empty string */
   }

[Refdb-cvs] CVS: refdb/src dbfncs.c,1.13,1.14

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24376

Modified Files:
	dbfncs.c 
Log Message:
refdb_citekey and note_key are now UNIQUE for SQLite too

Index: dbfncs.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/dbfncs.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -U2 -r1.13 -r1.14
--- dbfncs.c	26 Dec 2003 00:08:46 -0000	1.13
+++ dbfncs.c	25 Jan 2004 13:21:29 -0000	1.14
@@ -877,5 +877,5 @@
   dbires = dbi_conn_query(conn, "CREATE TABLE t_refdb \
                                    (refdb_id INTEGER PRIMARY KEY, \
-                                    refdb_citekey TEXT, \
+                                    refdb_citekey TEXT UNIQUE, \
                                     refdb_type TEXT, \
                                     refdb_pubyear SMALLINT, \
@@ -1051,5 +1051,5 @@
   dbires = dbi_conn_query(conn, "CREATE TABLE t_note \
                                    (note_id INTEGER PRIMARY KEY, \
-                                    note_key TEXT, \
+                                    note_key TEXT UNIQUE, \
                                     note_title TEXT, \
                                     note_content_type TEXT, \

[Refdb-cvs] CVS: refdb/examples testrefs.xml,1.2,1.3

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

Update of /cvsroot/refdb/refdb/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23414/examples

Modified Files:
	testrefs.xml 
Log Message:
added encoding to processing instructions

Index: testrefs.xml
===================================================================
RCS file: /cvsroot/refdb/refdb/examples/testrefs.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- testrefs.xml	6 Jan 2004 21:50:41 -0000	1.2
+++ testrefs.xml	25 Jan 2004 13:15:11 -0000	1.3
@@ -1,3 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"? encoding="UTF-8">
 <!DOCTYPE ris PUBLIC "-//Markus Hoenicka//DTD Ris V1.0.2//EN" "http://refdb.sourceforge.net/dtd/risx/risx-1.02/risx.dtd">
 <ris>

[Refdb-cvs] CVS: refdb/src risxhandler.c,1.23,1.24

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1408/src

Modified Files:
	risxhandler.c 
Log Message:
added argument to get_unique_citekey()

Index: risxhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risxhandler.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -U2 -r1.23 -r1.24
--- risxhandler.c	19 Jan 2004 23:26:50 -0000	1.23
+++ risxhandler.c	25 Jan 2004 19:31:56 -0000	1.24
@@ -1650,5 +1650,5 @@
       /* insert new citekey if required */
       if (!strcmp(ptr_ardata->real_citekey, "0") && ptr_ardata->create_new) {
-	citekey = get_unique_citekey(ptr_ardata->conn, ptr_ardata->first_author, atoi(ptr_ardata->ck_year), ptr_ardata->n_refdb_id);
+	citekey = get_unique_citekey(ptr_ardata->conn, ptr_ardata->first_author, atoi(ptr_ardata->ck_year), ptr_ardata->n_refdb_id, 0 /* ref */);
 	
 	if (citekey && set_risdata_field(ptr_ardata->ptr_risdata, "citekey", citekey, ptr_ardata->driver) != 0) {

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

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24721

Modified Files:
	noteshandler.c 
Log Message:
reset ptr_andata->real_key for each new dataset; adapted to new get_unique_citekey() argument list

Index: noteshandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -U2 -r1.12 -r1.13
--- noteshandler.c	19 Jan 2004 23:20:07 -0000	1.12
+++ noteshandler.c	25 Jan 2004 13:23:38 -0000	1.13
@@ -111,4 +111,5 @@
       *(ptr_andata->content_type) = '\0';
       *(ptr_andata->content_xmllang) = '\0';
+      *(ptr_andata->real_key) = '\0';
 
       /* isolate attributes */
@@ -874,5 +875,5 @@
       /* insert new citekey if required */
       if (!strcmp(ptr_andata->real_key, "0") && ptr_andata->create_new) {
-	key = get_unique_citekey(ptr_andata->conn, ptr_andata->user, atoi(ptr_andata->year), ptr_andata->n_note_id);
+	key = get_unique_citekey(ptr_andata->conn, ptr_andata->user, atoi(ptr_andata->year), ptr_andata->n_note_id, 1 /* notes */);
 	
 	if (key && set_notesdata_field("key", key, ptr_andata->conn, ptr_andata->driver, ptr_andata->n_note_id) != 0) {

[Refdb-cvs] CVS: refdb/src backendn-notex.c,1.7,1.8

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24159

Modified Files:
	backendn-notex.c 
Log Message:
fixed indention

Index: backendn-notex.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backendn-notex.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -U2 -r1.7 -r1.8
--- backendn-notex.c	6 Jan 2004 15:37:13 -0000	1.7
+++ backendn-notex.c	25 Jan 2004 13:20:10 -0000	1.8
@@ -132,5 +132,5 @@
 
   /*initialize xindent */
-  xindent.indent_current = 0;
+  xindent.indent_current = 2;
   xindent.maybe_in_leaf = 0;
   xindent.indent_toodeep = 0;

[Refdb-cvs] CVS: refdb configure.in,1.44,1.45

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

Update of /cvsroot/refdb/refdb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1827

Modified Files:
	configure.in 
Log Message:
fixed iconv test

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -U2 -r1.44 -r1.45
--- configure.in	22 Jan 2004 01:05:13 -0000	1.44
+++ configure.in	25 Jan 2004 19:34:12 -0000	1.45
@@ -6,5 +6,5 @@
 
 dnl Use automake
-AM_INIT_AUTOMAKE(refdb, 0.9.4-pre4)
+AM_INIT_AUTOMAKE(refdb, 0.9.4-pre5)
 
 dnl Find out host type
@@ -192,4 +192,8 @@
 
 if test "$ac_server" = "YES"; then
+
+dnl see how to get iconv support
+AM_ICONV_LINK
+
 dnl linking with libdl is necessary on some systems
 AC_SEARCH_LIBS_VAR(dlopen, dl,,,,refdbd_LDADD)
@@ -208,5 +212,5 @@
 
 dnl need character encoding support
-AC_SEARCH_LIBS_VAR(iconv, iconv, , , , refdbd_LDADD)
+dnl AC_SEARCH_LIBS_VAR(iconv, iconv, , , , refdbd_LDADD)
 
 fi dnl end if build server

[Refdb-cvs] CVS: refdb/src refdbd.c,1.68,1.69

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

Update of /cvsroot/refdb/refdb/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16573

Modified Files:
	refdbd.c 
Log Message:
split encoding variable into db_encoding and in_encoding

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -U2 -r1.68 -r1.69
--- refdbd.c	22 Jan 2004 01:30:55 -0000	1.68
+++ refdbd.c	23 Jan 2004 00:13:17 -0000	1.69
@@ -62,5 +62,5 @@
 #endif
 
-Prefs prefs[20] = {
+Prefs prefs[21] = {
   {"serverip", ""},
   {"timeout", ""},
@@ -82,4 +82,5 @@
   {"upper_citekey", ""},
   {"remoteconnect", ""},
+  {"in_encoding", ""},
   {"", ""}
 };
@@ -108,5 +109,6 @@
 char keep_pnames[PREFS_BUF_LEN] = ""; /* whether to keep periodical names */
 char upper_citekey[PREFS_BUF_LEN] = ""; /* whether to uppercase citation keys */
-char default_db_encoding[PREFS_BUF_LEN] = "UTF-8"; /* default char encoding for new databases */
+char default_db_encoding[PREFS_BUF_LEN] = ""; /* default char encoding for new databases */
+char default_input_encoding[PREFS_BUF_LEN] = "UTF-8"; /* default char encoding for input data */
 char keyword_scan[PREFS_BUF_LEN] = ""; /* run automatic keyword scan if 't' */
 
@@ -230,4 +232,5 @@
   prefs[17].varvalue = upper_citekey;
   prefs[18].varvalue = remote_connect;
+  prefs[19].varvalue = default_input_encoding;
 
   *dbi_driver_dir = '\0';
@@ -1245,5 +1248,5 @@
 	    else if (strcmp((ptr_child_clrequest->inargv)[0], "addref") == 0) {
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 	      result = addref(ptr_child_clrequest, set_owner, &addresult, 0, n_keep_id, format_string, &id_sentinel, db_encoding);
@@ -1278,5 +1281,5 @@
 	    else if (strcmp((ptr_child_clrequest->inargv)[0], "updateref") == 0) {
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 	      result = addref(ptr_child_clrequest, set_owner, &addresult, n_personal, n_keep_id, format_string, &id_sentinel, db_encoding);
@@ -1435,5 +1438,5 @@
 
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 
@@ -1463,5 +1466,5 @@
 	    else if (strcmp((ptr_child_clrequest->inargv)[0], "addnote") == 0) {
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 	      result = addnote(ptr_child_clrequest, set_owner, &addresult, 0, &id_sentinel, db_encoding);
@@ -1474,5 +1477,5 @@
 	    else if (strcmp((ptr_child_clrequest->inargv)[0], "updatenote") == 0) {
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 	      result = addnote(ptr_child_clrequest, set_owner, &addresult, 1, &id_sentinel, db_encoding);
@@ -1506,5 +1509,5 @@
 
 	      if (!*db_encoding) {
-		strcpy(db_encoding, default_db_encoding);
+		strcpy(db_encoding, default_input_encoding);
 	      }
 

[Refdb-cvs] CVS: refdb/src refdbd.c,1.67,1.68

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

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

Modified Files:
	refdbd.c 
Log Message:
make UTF-8 default output encoding for getref() and getnote()

Index: refdbd.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbd.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -U2 -r1.67 -r1.68
--- refdbd.c	18 Jan 2004 21:15:31 -0000	1.67
+++ refdbd.c	22 Jan 2004 01:30:55 -0000	1.68
@@ -1434,4 +1434,8 @@
 	      unsigned long long n_refs;
 
+	      if (!*db_encoding) {
+		strcpy(db_encoding, default_db_encoding);
+	      }
+
 	      biblio_info.encoding = db_encoding;
 
@@ -1501,4 +1505,8 @@
 	      unsigned long long n_notes;
 
+	      if (!*db_encoding) {
+		strcpy(db_encoding, default_db_encoding);
+	      }
+
 	      biblio_info.encoding = db_encoding;
 

[Refdb-cvs] CVS: refdb/src refdbdref.c,1.54,1.55

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

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

Modified Files:
	refdbdref.c 
Log Message:
whichdb() now returns database encoding; fixed two memory leaks; include errno.h to make Linux happy

Index: refdbdref.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -U2 -r1.54 -r1.55
--- refdbdref.c	19 Jan 2004 23:23:00 -0000	1.54
+++ refdbdref.c	22 Jan 2004 01:16:43 -0000	1.55
@@ -28,4 +28,5 @@
 #include <expat.h> /* the xml parser header file */
 #include <iconv.h>
+#include <errno.h>
 #include <dbi/dbi.h>
 
@@ -118,4 +119,5 @@
   char modify_date[64];
   char* return_msg;
+  const char* db_encoding;
   unsigned long long numrefs;
   unsigned long long maxid;
@@ -145,4 +147,6 @@
   driver = dbi_conn_get_driver(conn);
 
+  db_encoding = dbi_conn_get_encoding(conn);
+
   dbires = dbi_conn_query(conn, "SELECT COUNT(*), MAX(refdb_id) FROM t_refdb WHERE refdb_type!='DUMMY'");
   if (!dbires) {
@@ -232,5 +236,5 @@
   
   /* The returned integers are quads (8byte) */
-  sprintf(return_msg, "Current database: %s\nNumber of references: "ULLSPEC"\nHighest reference ID: "ULLSPEC"\nNumber of notes: "ULLSPEC"\nHighest note ID: "ULLSPEC"\nDatabase type: %s\nDatabase server: %s\nCreated: %s UTC\nUsing %s version: %s\nLast modified: %s UTC\n", ptr_clrequest->current_db, (unsigned long long)numrefs, (unsigned long long)maxid, (unsigned long long)numnotes, (unsigned long long)maxnid, dbi_result_get_string(dbires, "meta_type"), dbi_driver_get_name(driver), create_date, dbi_result_get_string(dbires, "meta_app"), dbi_result_get_string(dbires, "meta_version"), modify_date);
+  sprintf(return_msg, "Current database: %s\nNumber of references: "ULLSPEC"\nHighest reference ID: "ULLSPEC"\nNumber of notes: "ULLSPEC"\nHighest note ID: "ULLSPEC"\nEncoding: %s\nDatabase type: %s\nDatabase server: %s\nCreated: %s UTC\nUsing %s version: %s\nLast modified: %s UTC\n", ptr_clrequest->current_db, (unsigned long long)numrefs, (unsigned long long)maxid, (unsigned long long)numnotes, (unsigned long long)maxnid, db_encoding, dbi_result_get_string(dbires, "meta_type"), dbi_driver_get_name(driver), create_date, dbi_result_get_string(dbires, "meta_app"), dbi_result_get_string(dbires, "meta_version"), modify_date);
 
   dbi_result_free(dbires);
@@ -241,4 +245,6 @@
   }
 
+  free(return_msg);
+
   dbi_conn_close(conn);
 
@@ -662,4 +668,5 @@
 	    return 0;
 	  }
+	  free(ris_set);
 	  return 0;
 	}
@@ -712,4 +719,5 @@
   } while (n_requested_bufsize);
 
+  /* ris_set should be deallocated by now due to a realloc(0) call */
   return set_count;
 }
@@ -960,4 +968,6 @@
   dbi_result_free(dbires);
 
+  free(sql_command);
+
   dbi_result_free(dbires_kwlist);
   dbi_conn_close(conn);

[Refdb-cvs] CVS: refdb/src refdbdnote.c,1.16,1.17

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

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

Modified Files:
	refdbdnote.c 
Log Message:
include errno.h to make Linux happy

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -U2 -r1.16 -r1.17
--- refdbdnote.c	19 Jan 2004 23:20:07 -0000	1.16
+++ refdbdnote.c	22 Jan 2004 01:13:46 -0000	1.17
@@ -26,4 +26,5 @@
 #include <expat.h> /* the xml parser header file */
 #include <iconv.h>
+#include <errno.h>
 
 #include "refdb.h"

[Refdb-cvs] CVS: refdb/src refdbdbib.c,1.31,1.32

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

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

Modified Files:
	refdbdbib.c 
Log Message:
include errno.h to make Linux happy

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -U2 -r1.31 -r1.32
--- refdbdbib.c	19 Jan 2004 23:20:07 -0000	1.31
+++ refdbdbib.c	22 Jan 2004 01:11:55 -0000	1.32
@@ -35,4 +35,5 @@
 #include <expat.h>
 #include <iconv.h>
+#include <errno.h>
 #include <dbi/dbi.h>
 

[Refdb-cvs] CVS: refdb/src backend-risx.c,1.27,1.28

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

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

Modified Files:
	backend-risx.c 
Log Message:
fixed out-of-order arguments in print_elstart_x() call

Index: backend-risx.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -U2 -r1.27 -r1.28
--- backend-risx.c	19 Jan 2004 23:09:13 -0000	1.27
+++ backend-risx.c	22 Jan 2004 01:09:40 -0000	1.28
@@ -367,5 +367,5 @@
   *buffer = '\0';
 
-  if (print_elstart_x(&buffer, &buffer_len, "set", NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, &xindent) == NULL) {
+  if (print_elstart_x(&buffer, &buffer_len, "set", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, &xindent) == NULL) {
     free(buffer);
     return NULL;

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

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

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

Modified Files:
	backend-html.c 
Log Message:
removed superfluous para end tag

Index: backend-html.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-html.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -U2 -r1.22 -r1.23
--- backend-html.c	4 Jan 2004 01:55:50 -0000	1.22
+++ backend-html.c	22 Jan 2004 01:08:13 -0000	1.23
@@ -686,11 +686,11 @@
     }
   }
-  if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</p>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
-    LOG_PRINT(LOG_WARNING, outomem.text);
-    return NULL;
-  }
-  else {
-    *(ptr_rendinfo->ptr_ref) = new_ref;
-  }
+/*   if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "</p>\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { */
+/*     LOG_PRINT(LOG_WARNING, outomem.text); */
+/*     return NULL; */
+/*   } */
+/*   else { */
+/*     *(ptr_rendinfo->ptr_ref) = new_ref; */
+/*   } */
   
   /*----------------------------------------------------------------*/

[Refdb-cvs] CVS: refdb/doc Makefile,1.2,1.3

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

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

Modified Files:
	Makefile 
Log Message:
added install target

Index: Makefile
===================================================================
RCS file: /cvsroot/refdb/refdb/doc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -U2 -r1.2 -r1.3
--- Makefile	17 Jan 2004 00:01:27 -0000	1.2
+++ Makefile	22 Jan 2004 01:05:54 -0000	1.3
@@ -7,2 +7,4 @@
 distdir:
 	echo "nothing to do yet"
+install:
+	echo "nothing to do yet"

[Refdb-cvs] CVS: refdb configure.in,1.43,1.44

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

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

Modified Files:
	configure.in 
Log Message:
added back the lost xsl directory

Index: configure.in
===================================================================
RCS file: /cvsroot/refdb/refdb/configure.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -U2 -r1.43 -r1.44
--- configure.in	18 Jan 2004 00:55:06 -0000	1.43
+++ configure.in	22 Jan 2004 01:05:13 -0000	1.44
@@ -120,5 +120,5 @@
 
 if test "$ac_client" = "YES" && test "$ac_server" = "YES"; then
-client_subdirs="declarations dsssl dtd styles"
+client_subdirs="declarations dsssl dtd styles xsl"
 client_bins="refdbib refdbc refdba refdbxp nmed2ris eenc"
 client_scripts="refdbjade runbib tex2mail db2ris refdbxml marc2ris.pl med2ris.pl en2ris.pl refdbnd dos2unix"
@@ -126,5 +126,5 @@
 client_etc_distobjects="bib2risrc bib2riscgirc db2risrc nmed2risrc nmed2riscgirc refdbarc refdbcrc refdbcgirc refdbibrc med2risrc med2riscgirc marc2risrc"
 elif test "$ac_client" = "YES"; then
-client_subdirs="declarations dsssl dtd etc examples scripts src styles doc"
+client_subdirs="declarations dsssl dtd etc examples scripts src styles doc xsl"
 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"

[Refdb-cvs] CVS: refdb Makefile.am,1.14,1.15

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

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

Modified Files:
	Makefile.am 
Log Message:
added back the lost xsl directory

Index: Makefile.am
===================================================================
RCS file: /cvsroot/refdb/refdb/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -U2 -r1.14 -r1.15
--- Makefile.am	6 Jan 2004 18:11:33 -0000	1.14
+++ Makefile.am	22 Jan 2004 01:04:45 -0000	1.15
@@ -11,4 +11,4 @@
 	cp -p conf/config.guess conf/config.sub conf/install-sh conf/missing conf/mkinstalldirs $(distdir)/conf
 	$(mkinstalldirs) $(distdir)/doc
-	cp -p doc/*.sgml doc/*.eps doc/*.pdf doc/*.png doc/catalog doc/readme.txt doc/tex2mail.README $(distdir)/doc
+	cp -p doc/*.sgml doc/*.eps doc/*.pdf doc/*.png doc/catalog doc/readme.txt doc/tex2mail.README doc/Makefile $(distdir)/doc
 

[Refdb-cvs] CVS: refdb/src risxhandler.c,1.22,1.23

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

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

Modified Files:
	risxhandler.c 
Log Message:
update length info of allocated string when moving the iconv()-fiddled string; fixed import of publication titles

Index: risxhandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/risxhandler.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -U2 -r1.22 -r1.23
--- risxhandler.c	17 Jan 2004 22:47:20 -0000	1.22
+++ risxhandler.c	19 Jan 2004 23:26:50 -0000	1.23
@@ -699,4 +699,5 @@
       }
       (ptr_ardata->ptr_first)->ptr_elvalue = my_elvalue_start;
+      (ptr_ardata->ptr_first)->n_elvalue_len = outlength;
     }
     /* else: no conversion required */
@@ -765,6 +766,13 @@
 	  }
 	}
-	else {    
-	  result = set_risdata_field(ptr_ardata->ptr_risdata, "booktitle", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver);
+	else {
+	  if (!strcmp(ptr_ardata->type, "CHAP")
+	      || !strcmp(ptr_ardata->type, "CASE")
+	      || !strcmp(ptr_ardata->type, "BOOK")) {
+	    result = set_risdata_field(ptr_ardata->ptr_risdata, "booktitle", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver);
+	  }
+	  else {
+	    result = set_risdata_field(ptr_ardata->ptr_risdata, "title", (ptr_ardata->ptr_first)->ptr_elvalue, ptr_ardata->driver);
+	  }
 	}
       }

[Refdb-cvs] CVS: refdb/src refdbdref.c,1.53,1.54

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

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

Modified Files:
	refdbdref.c 
Log Message:
update length info of allocated string when moving the iconv()-fiddled string; increased length of iconv output string for RIS data

Index: refdbdref.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -U2 -r1.53 -r1.54
--- refdbdref.c	18 Jan 2004 21:19:11 -0000	1.53
+++ refdbdref.c	19 Jan 2004 23:23:00 -0000	1.54
@@ -620,6 +620,6 @@
 	inlength = strlen(ris_set) + 1;
 	/* with the encodings supported by our database engines, the converted
-	   string can't be longer than the input string */
-	outlength = inlength;
+	   string can't be longer than three times the input string */
+	outlength = 3*inlength;
 
 	if ((my_ris_set = (char*)malloc(outlength)) == NULL) {
@@ -4041,4 +4041,5 @@
       }
       sql_command = my_sql_command_start;
+      sql_command_len = outlength;
     }
     /* else: no conversion required */

[Refdb-cvs] CVS: refdb/src noteshandler.c,1.11,1.12 refdbdbib.c,1.30,1.31 refdbdnote.c,1.15,1.16

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

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

Modified Files:
	noteshandler.c refdbdbib.c refdbdnote.c 
Log Message:
update length info of allocated string when moving the iconv()-fiddled string

Index: noteshandler.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/noteshandler.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -U2 -r1.11 -r1.12
--- noteshandler.c	17 Jan 2004 22:47:20 -0000	1.11
+++ noteshandler.c	19 Jan 2004 23:20:07 -0000	1.12
@@ -686,4 +686,5 @@
       }
       (ptr_andata->ptr_first)->ptr_elvalue = my_elvalue_start;
+      (ptr_andata->ptr_first)->n_elvalue_len = outlength;
     }
     /* else: no conversion required */

Index: refdbdbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdbib.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -U2 -r1.30 -r1.31
--- refdbdbib.c	18 Jan 2004 21:17:37 -0000	1.30
+++ refdbdbib.c	19 Jan 2004 23:20:07 -0000	1.31
@@ -908,7 +908,4 @@
       }
 
-      /* todo: run iconv here */
-
-
       /* run a character encoding conversion if required */
       if (conv_descriptor && *outbuffer) {
@@ -962,4 +959,5 @@
 	}
 	outbuffer = my_outbuffer_start;
+	outbuffer_len = outlength;
       }
       /* else: no conversion required */

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -U2 -r1.15 -r1.16
--- refdbdnote.c	18 Jan 2004 21:19:11 -0000	1.15
+++ refdbdnote.c	19 Jan 2004 23:20:07 -0000	1.16
@@ -2051,4 +2051,5 @@
       }
       sql_command = my_sql_command_start;
+      sql_command_len = outlength;
     }
     /* else: no conversion required */

[Refdb-cvs] CVS: refdb/src backend-scrn.c,1.15,1.16

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

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

Modified Files:
	backend-scrn.c 
Log Message:
removed empty line before book title

Index: backend-scrn.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-scrn.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -U2 -r1.15 -r1.16
--- backend-scrn.c	26 Dec 2003 00:03:34 -0000	1.15
+++ backend-scrn.c	19 Jan 2004 23:13:01 -0000	1.16
@@ -359,12 +359,12 @@
       if (item != NULL) {
 	nhave_booktitle++;
-	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) {
-	  free(item);
-	  LOG_PRINT(LOG_WARNING, outomem.text);
-	  return NULL;
-	}
-	else {
-	  *(ptr_rendinfo->ptr_ref) = new_ref;
-	}
+/* 	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), "\n", ptr_rendinfo->ptr_ref_len, 0)) == NULL) { */
+/* 	  free(item); */
+/* 	  LOG_PRINT(LOG_WARNING, outomem.text); */
+/* 	  return NULL; */
+/* 	} */
+/* 	else { */
+/* 	  *(ptr_rendinfo->ptr_ref) = new_ref; */
+/* 	} */
 	if ((new_ref = mstrcat(*(ptr_rendinfo->ptr_ref), (char*)item, ptr_rendinfo->ptr_ref_len, 0)) == NULL) { /* book title */
 	  free(item);

[Refdb-cvs] CVS: refdb/src backend-risx.c,1.26,1.27

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

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

Modified Files:
	backend-risx.c 
Log Message:
fixed indentation

Index: backend-risx.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-risx.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -U2 -r1.26 -r1.27
--- backend-risx.c	17 Jan 2004 00:11:03 -0000	1.26
+++ backend-risx.c	19 Jan 2004 23:09:13 -0000	1.27
@@ -150,5 +150,5 @@
 
   /*initialize xindent */
-  xindent.indent_current = 0;
+  xindent.indent_current = 2;
   xindent.maybe_in_leaf = 0;
   xindent.indent_toodeep = 0;

[Refdb-cvs] CVS: refdb/src backend-dbib.c,1.26,1.27

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

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

Modified Files:
	backend-dbib.c 
Log Message:
output encoding in headers where appropriate

Index: backend-dbib.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/backend-dbib.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -U2 -r1.26 -r1.27
--- backend-dbib.c	3 Jan 2004 20:11:43 -0000	1.26
+++ backend-dbib.c	19 Jan 2004 23:07:40 -0000	1.27
@@ -70,4 +70,5 @@
   char *myjournal = NULL;
   const char *drivername;
+  const char* db_encoding;
   dbi_result dbires_cit;
 
@@ -127,4 +128,15 @@
     }
       
+    /* todo: set encoding appropriately */
+
+    /* get the database encoding */
+    if (!*(ptr_biblio_info->encoding)) {
+      db_encoding = dbi_conn_get_encoding(conn);
+    }
+    else {
+      db_encoding = (const char*)ptr_biblio_info->encoding;
+    }
+
+
     /* the bibliography must not have a doctype line if it is included
        as an external entity */
@@ -133,10 +145,10 @@
     }
     else if (n_ref_format == REFDOCBKX) {
-      sprintf(ref, "<!-- <?xml version=\"1.0\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title>%s</title>\n", item);
+      sprintf(ref, "<!-- <?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title>%s</title>\n", db_encoding, item);
     }
     /* here we need the doctype line as the bibliography will be transformed
        to TEI */
     else if (n_ref_format == REFTEIX) {
-      sprintf(ref, "<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\">\n<bibliography role=\"refdb\">\n<title>%s</title>\n", item);
+      sprintf(ref, "<?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">\n<bibliography role=\"refdb\">\n<title>%s</title>\n", db_encoding, item);
     }
   }
@@ -146,8 +158,8 @@
     }
     else if (n_ref_format == REFDOCBKX) {
-      strcpy(ref, "<!-- <?xml version=\"1.0\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title>Bibliography</title>\n");
+      sprintf(ref, "<!-- <?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title>Bibliography</title>\n", db_encoding);
     }
     else if (n_ref_format == REFTEIX) {
-      strcpy(ref, "<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\">\n<bibliography role=\"refdb\">\n<title>Bibliography</title>\n");
+      sprintf(ref, "<?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">\n<bibliography role=\"refdb\">\n<title>Bibliography</title>\n", db_encoding);
     }
   }
@@ -157,8 +169,8 @@
     }
     else if (n_ref_format == REFDOCBKX) {
-      strcpy(ref, "<!-- <?xml version=\"1.0\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title></title>\n");
+      sprintf(ref, "<!-- <?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"> -->\n<bibliography role=\"refdb\">\n<title></title>\n", db_encoding);
     }
     else if (n_ref_format == REFTEIX) {
-      strcpy(ref, "<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook V3.1//EN\">\n<bibliography role=\"refdb\">\n<title></title>\n");
+      sprintf(ref, "<?xml version=\"1.0\" encoding=\"%s\"?>\n<!DOCTYPE bibliography PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\" \"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\">\n<bibliography role=\"refdb\">\n<title></title>\n", db_encoding);
     }
   }