refdb-cvs

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

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

Modified Files:
	refdbdnote.c refdbdref.c 
Log Message:
improved log output if iconv_open() fails

Index: refdbdnote.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdnote.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -U2 -r1.17 -r1.18
--- refdbdnote.c	22 Jan 2004 01:13:46 -0000	1.17
+++ refdbdnote.c	25 Jan 2004 13:30:39 -0000	1.18
@@ -132,10 +132,10 @@
     if (andata.conv_descriptor == (iconv_t)(-1)) {
       andata.conv_descriptor = NULL;
-      LOG_PRINT(LOG_WARNING, "cannot set output encoding");
+      LOG_PRINT(LOG_WARNING, "cannot set output encoding (database):");
     }
     else {
       LOG_PRINT(LOG_DEBUG, "encoding is now:");
-      LOG_PRINT(LOG_DEBUG, db_encoding);
     }
+    LOG_PRINT(LOG_DEBUG, db_encoding);
   }
   else {
@@ -700,5 +700,7 @@
     conv_descriptor = iconv_open(!strcmp(ptr_biblio_info->encoding, "US-ASCII") ? "ASCII" : ptr_biblio_info->encoding, !strcmp(db_encoding, "US-ASCII") ? "ASCII" : db_encoding);
     if (conv_descriptor == (iconv_t)(-1)) {
-      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor");
+      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor (database/output):");
+      LOG_PRINT(LOG_DEBUG, db_encoding);
+      LOG_PRINT(LOG_DEBUG, ptr_biblio_info->encoding);
       iwrite(ptr_clrequest->fd, "cannot set conversion descriptor\n", 33);
       delete_all_lilimem(&sentinel);

Index: refdbdref.c
===================================================================
RCS file: /cvsroot/refdb/refdb/src/refdbdref.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -U2 -r1.55 -r1.56
--- refdbdref.c	22 Jan 2004 01:16:43 -0000	1.55
+++ refdbdref.c	25 Jan 2004 13:30:39 -0000	1.56
@@ -346,5 +346,7 @@
     if (ardata.conv_descriptor == (iconv_t)(-1)) {
       ardata.conv_descriptor = NULL;
-      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor");
+      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor (input/database):");
+      LOG_PRINT(LOG_DEBUG, input_encoding);
+      LOG_PRINT(LOG_DEBUG, db_encoding);
     }
     else {
@@ -2216,5 +2218,7 @@
     conv_descriptor = iconv_open(!strcmp(ptr_biblio_info->encoding, "US-ASCII") ? "ASCII" : ptr_biblio_info->encoding, !strcmp(db_encoding, "US-ASCII") ? "ASCII" : db_encoding);
     if (conv_descriptor == (iconv_t)(-1)) {
-      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor");
+      LOG_PRINT(LOG_WARNING, "cannot set conversion descriptor (database/output):");
+      LOG_PRINT(LOG_DEBUG, db_encoding);
+      LOG_PRINT(LOG_DEBUG, ptr_biblio_info->encoding);
       if (ptr_clrequest->n_cgi) { /* cgi output */
 	iwrite(ptr_clrequest->fd, cgihead_plain.text, cgihead_plain.length);