From ad597b1d7570692ee28deb57251356ceb9bb271a Mon Sep 17 00:00:00 2001 From: calvinrsmith Date: Sat, 15 Jan 2005 05:02:04 +0000 Subject: [PATCH] *** keyword substitution change *** --- doc/Makefile.am | 2 +- doc/install.sgml | 8 +- include/mdbodbc.h | 2 +- include/mdbtools.h | 1 - mkinstalldirs | 2 +- src/libmdb/backend.c | 183 ++++++++++++++++++++++--------------------- src/libmdb/mem.c | 10 ++- src/odbc/odbc.c | 2 +- src/odbc/unittest.c | 2 +- 9 files changed, 110 insertions(+), 102 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index acaa43b..ed27686 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ # Converting DocBook to HTML (several small files) # http://www.freebsd.org/tutorials/docproj-primer/x3132.html#AEN3140 -# version: $Id: Makefile.am,v 1.4 2004/02/09 03:09:53 brianb Exp $ +# version: $Id: Makefile.am,v 1.5 2005/01/15 05:02:11 calvinrsmith Exp $ SHELL = /bin/sh TXT2MAN = $(srcdir)/txt2man RELEASE = 0.5 diff --git a/doc/install.sgml b/doc/install.sgml index dd3a8d5..a179e6f 100644 --- a/doc/install.sgml +++ b/doc/install.sgml @@ -2,8 +2,8 @@ ]> - $Date: 2004/09/24 05:08:12 $ - $Revision: 1.5 $ + $Date: 2005/01/15 05:02:10 $ + $Revision: 1.6 $ <productname>MDB Tools</productname> Installation Guide A Guide to Installing and Configuring MDB Tools @@ -34,9 +34,9 @@ This guide is intended to provide help with installing and configuring the A few technical notes. This guide is written in SGML DocBook format, specifications for which are found in the DocBook book. It was converted to HTML with OpenJade. The document you are reading is version -$Revision: 1.5 $ +$Revision: 1.6 $ , dated -$Date: 2004/09/24 05:08:12 $ (CVS control number $Id: install.sgml,v 1.5 2004/09/24 05:08:12 whydoubt Exp $). The most recent version can be found on the MDB Tools +$Date: 2005/01/15 05:02:10 $ (CVS control number $Id: install.sgml,v 1.6 2005/01/15 05:02:10 calvinrsmith Exp $). The most recent version can be found on the MDB Tools web site. diff --git a/include/mdbodbc.h b/include/mdbodbc.h index 0a83078..9240ccf 100644 --- a/include/mdbodbc.h +++ b/include/mdbodbc.h @@ -36,7 +36,7 @@ extern "C" { #endif static char rcsid_sql_h [ ] = - "$Id: mdbodbc.h,v 1.4 2004/10/16 14:21:15 whydoubt Exp $"; + "$Id: mdbodbc.h,v 1.5 2005/01/15 05:02:13 calvinrsmith Exp $"; static void *no_unused_sql_h_warn[]={rcsid_sql_h, no_unused_sql_h_warn}; struct _henv { diff --git a/include/mdbtools.h b/include/mdbtools.h index 62e3194..92146b9 100644 --- a/include/mdbtools.h +++ b/include/mdbtools.h @@ -16,7 +16,6 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - #ifndef _mdbtools_h_ #define _mdbtools_h_ diff --git a/mkinstalldirs b/mkinstalldirs index 937dcda..765cb6c 100755 --- a/mkinstalldirs +++ b/mkinstalldirs @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 2001/04/16 00:00:29 brianb Exp $ +# $Id: mkinstalldirs,v 1.2 2005/01/15 05:02:10 calvinrsmith Exp $ errstatus=0 diff --git a/src/libmdb/backend.c b/src/libmdb/backend.c index 7ae53da..534f458 100644 --- a/src/libmdb/backend.c +++ b/src/libmdb/backend.c @@ -17,123 +17,130 @@ * Boston, MA 02111-1307, USA. */ +#ifdef JAVA +#include "javadefines.h" +#define MdbBackendType_STRUCT_ELEMENT(a,b,c,d) new MdbBackendType(a,b,c,d) +#else +#define MdbBackendType_STRUCT_ELEMENT(a,b,c,d) {a,b,c,d} /* ** functions to deal with different backend database engines */ - +# #include "mdbtools.h" #ifdef DMALLOC #include "dmalloc.h" #endif +#endif /* JAVA */ + static int is_init; static GHashTable *mdb_backends; /* Access data types */ static MdbBackendType mdb_access_types[] = { - {"Unknown 0x00", 0,0,0 }, - {"Boolean", 0,0,0}, - {"Byte", 0,0,0}, - {"Integer", 0,0,0}, - {"Long Integer", 0,0,0}, - {"Currency", 0,0,0}, - {"Single", 0,0,0}, - {"Double", 0,0,0}, - {"DateTime (Short)", 0,0,1}, - {"Unknown 0x09", 0,0,0}, - {"Text", 1,0,1}, - {"OLE", 1,0,1}, - {"Memo/Hyperlink",1,0,1}, - {"Unknown 0x0d",0,0,0}, - {"Unknown 0x0e",0,0,0}, - {"Replication ID",0,0,0}, - {"Numeric",1,1,0} + MdbBackendType_STRUCT_ELEMENT("Unknown 0x00", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Boolean", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Byte", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Integer", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Long Integer", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Currency", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Single", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Double", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("DateTime (Short)", 0,0,1), + MdbBackendType_STRUCT_ELEMENT("Unknown 0x09", 0,0,0), + MdbBackendType_STRUCT_ELEMENT("Text", 1,0,1), + MdbBackendType_STRUCT_ELEMENT("OLE", 1,0,1), + MdbBackendType_STRUCT_ELEMENT("Memo/Hyperlink",1,0,1), + MdbBackendType_STRUCT_ELEMENT("Unknown 0x0d",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Unknown 0x0e",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Replication ID",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Numeric",1,1,0) }; /* Oracle data types */ static MdbBackendType mdb_oracle_types[] = { - {"Oracle_Unknown 0x00",0,0,0}, - {"NUMBER",1,0,0}, - {"NUMBER",1,0,0}, - {"NUMBER",1,0,0}, - {"NUMBER",1,0,0}, - {"NUMBER",1,0,0}, - {"FLOAT",0,0,0}, - {"FLOAT",0,0,0}, - {"DATE",0,0,0}, - {"Oracle_Unknown 0x09",0,0,0}, - {"VARCHAR2",1,0,1}, - {"BLOB",1,0,1}, - {"CLOB",1,0,1}, - {"Oracle_Unknown 0x0d",0,0,0}, - {"Oracle_Unknown 0x0e",0,0,0}, - {"NUMBER",1,0,0}, - {"NUMBER",1,0,0}, + MdbBackendType_STRUCT_ELEMENT("Oracle_Unknown 0x00",0,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("FLOAT",0,0,0), + MdbBackendType_STRUCT_ELEMENT("FLOAT",0,0,0), + MdbBackendType_STRUCT_ELEMENT("DATE",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Oracle_Unknown 0x09",0,0,0), + MdbBackendType_STRUCT_ELEMENT("VARCHAR2",1,0,1), + MdbBackendType_STRUCT_ELEMENT("BLOB",1,0,1), + MdbBackendType_STRUCT_ELEMENT("CLOB",1,0,1), + MdbBackendType_STRUCT_ELEMENT("Oracle_Unknown 0x0d",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Oracle_Unknown 0x0e",0,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), + MdbBackendType_STRUCT_ELEMENT("NUMBER",1,0,0), }; /* Sybase/MSSQL data types */ static MdbBackendType mdb_sybase_types[] = { - {"Sybase_Unknown 0x00",0,0,0}, - {"bit",0,0,0}, - {"char",1,0,1}, - {"smallint",0,0,0}, - {"int",0,0,0}, - {"money",0,0,0}, - {"real",0,0,0}, - {"float",0,0,0}, - {"smalldatetime",0,0,0}, - {"Sybase_Unknown 0x09",0,0,0}, - {"varchar",1,0,1}, - {"varbinary",1,0,1}, - {"text",1,0,1}, - {"Sybase_Unknown 0x0d",0,0,0}, - {"Sybase_Unknown 0x0e",0,0,0}, - {"Sybase_Replication ID",0,0,0}, - {"numeric",1,1,0}, + MdbBackendType_STRUCT_ELEMENT("Sybase_Unknown 0x00",0,0,0), + MdbBackendType_STRUCT_ELEMENT("bit",0,0,0), + MdbBackendType_STRUCT_ELEMENT("char",1,0,1), + MdbBackendType_STRUCT_ELEMENT("smallint",0,0,0), + MdbBackendType_STRUCT_ELEMENT("int",0,0,0), + MdbBackendType_STRUCT_ELEMENT("money",0,0,0), + MdbBackendType_STRUCT_ELEMENT("real",0,0,0), + MdbBackendType_STRUCT_ELEMENT("float",0,0,0), + MdbBackendType_STRUCT_ELEMENT("smalldatetime",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Sybase_Unknown 0x09",0,0,0), + MdbBackendType_STRUCT_ELEMENT("varchar",1,0,1), + MdbBackendType_STRUCT_ELEMENT("varbinary",1,0,1), + MdbBackendType_STRUCT_ELEMENT("text",1,0,1), + MdbBackendType_STRUCT_ELEMENT("Sybase_Unknown 0x0d",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Sybase_Unknown 0x0e",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Sybase_Replication ID",0,0,0), + MdbBackendType_STRUCT_ELEMENT("numeric",1,1,0), }; /* Postgres data types */ static MdbBackendType mdb_postgres_types[] = { - {"Postgres_Unknown 0x00",0,0,0}, - {"Bool",0,0,0}, - {"Int2",0,0,0}, - {"Int4",0,0,0}, - {"Int8",0,0,0}, - {"Money",0,0,0}, - {"Float4",0,0,0}, - {"Float8",0,0,0}, - {"Timestamp",0,0,0}, - {"Postgres_Unknown 0x09",0,0,0}, - {"Char",1,0,1}, - {"Postgres_Unknown 0x0b",0,0,0}, - {"Postgres_Unknown 0x0c",0,0,0}, - {"Postgres_Unknown 0x0d",0,0,0}, - {"Postgres_Unknown 0x0e",0,0,0}, - {"Serial",0,0,0}, - {"Postgres_Unknown 0x10",0,0,0}, + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x00",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Bool",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Int2",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Int4",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Int8",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Money",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Float4",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Float8",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Timestamp",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x09",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Char",1,0,1), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x0b",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x0c",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x0d",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x0e",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Serial",0,0,0), + MdbBackendType_STRUCT_ELEMENT("Postgres_Unknown 0x10",0,0,0), }; /* MySQL data types */ static MdbBackendType mdb_mysql_types[] = { - {"Text",1,0,1}, - {"char",0,0,0}, - {"int",0,0,0}, - {"int",0,0,0}, - {"int",0,0,0}, - {"float",0,0,0}, - {"float",0,0,0}, - {"float",0,0,0}, - {"date",0,0,1}, - {"varchar",1,0,1}, - {"varchar",1,0,1}, - {"varchar",1,0,1}, - {"text",1,0,1}, - {"blob",0,0,0}, - {"text",1,0,1}, - {"numeric",1,1,0}, - {"numeric",1,1,0}, + MdbBackendType_STRUCT_ELEMENT("Text",1,0,1), + MdbBackendType_STRUCT_ELEMENT("char",0,0,0), + MdbBackendType_STRUCT_ELEMENT("int",0,0,0), + MdbBackendType_STRUCT_ELEMENT("int",0,0,0), + MdbBackendType_STRUCT_ELEMENT("int",0,0,0), + MdbBackendType_STRUCT_ELEMENT("float",0,0,0), + MdbBackendType_STRUCT_ELEMENT("float",0,0,0), + MdbBackendType_STRUCT_ELEMENT("float",0,0,0), + MdbBackendType_STRUCT_ELEMENT("date",0,0,1), + MdbBackendType_STRUCT_ELEMENT("varchar",1,0,1), + MdbBackendType_STRUCT_ELEMENT("varchar",1,0,1), + MdbBackendType_STRUCT_ELEMENT("varchar",1,0,1), + MdbBackendType_STRUCT_ELEMENT("text",1,0,1), + MdbBackendType_STRUCT_ELEMENT("blob",0,0,0), + MdbBackendType_STRUCT_ELEMENT("text",1,0,1), + MdbBackendType_STRUCT_ELEMENT("numeric",1,1,0), + MdbBackendType_STRUCT_ELEMENT("numeric",1,1,0), }; - +#ifndef JAVA static gboolean mdb_drop_backend(gpointer key, gpointer value, gpointer data); char *mdb_get_coltype_string(MdbBackend *backend, int col_type) @@ -298,4 +305,4 @@ char *mdb_get_relationships(MdbHandle *mdb) return (char *)text; } - +#endif diff --git a/src/libmdb/mem.c b/src/libmdb/mem.c index 9c51832..dab224e 100644 --- a/src/libmdb/mem.c +++ b/src/libmdb/mem.c @@ -16,14 +16,16 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ - +#ifdef JAVA +#include "javadefines.h" +#else #include "mdbtools.h" #include #ifdef DMALLOC #include "dmalloc.h" #endif - +#endif /* JAVA */ /** * mdb_init: * @@ -31,7 +33,7 @@ * by calling program and prior to any other function. * **/ -void mdb_init() +METHOD void mdb_init() { mdb_init_backends(); } @@ -44,7 +46,7 @@ void mdb_init() * functions). * **/ -void mdb_exit() +METHOD void mdb_exit() { mdb_remove_backends(); } diff --git a/src/odbc/odbc.c b/src/odbc/odbc.c index 2a82067..4d36eca 100644 --- a/src/odbc/odbc.c +++ b/src/odbc/odbc.c @@ -27,7 +27,7 @@ #include "connectparams.h" -static char software_version[] = "$Id: odbc.c,v 1.28 2004/12/31 01:26:50 whydoubt Exp $"; +static char software_version[] = "$Id: odbc.c,v 1.29 2005/01/15 05:02:09 calvinrsmith Exp $"; static void *no_unused_var_warn[] = {software_version, no_unused_var_warn}; diff --git a/src/odbc/unittest.c b/src/odbc/unittest.c index 816c257..72db3d7 100644 --- a/src/odbc/unittest.c +++ b/src/odbc/unittest.c @@ -23,7 +23,7 @@ #include -static char software_version[] = "$Id: unittest.c,v 1.6 2002/04/09 01:19:26 brianb Exp $"; +static char software_version[] = "$Id: unittest.c,v 1.7 2005/01/15 05:02:09 calvinrsmith Exp $"; static void *no_unused_var_warn[] = {software_version, no_unused_var_warn};