Changeset 129

Timestamp:

11/18/09 04:40:30 (3 years ago)

Author:

mercyful

Message:

$ Build 438/Sql Alpha
+ Removed all SQLite Code and References.
+ Updated the SQL Wrapper, and all Automake files to now link in and also Detect MySql? in the configure scripts.
+ Added detection for OpenSSL, not in use yet, but will add encryption for passwords.

and anything else of intertest once everything is moved over to the SQL Backend.

This is still an interm develop update release, the MySql? backend
is still a WIP, and the Husky SMAPI Library will be removed shortly.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• INSTALL (modified) (1 diff)
• README (modified) (5 diffs)
• configure.in (modified) (3 diffs)
• enthral.kdevelop (modified) (4 diffs)
• enthral.kdevelop.pcs (modified) (previous)
• enthral.kdevses (modified) (1 diff)
• file_id.diz (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (7 diffs)
• src/sql_Database.cpp (modified) (12 diffs)
• src/sql_Database.h (modified) (10 diffs)
• src/sql_IError.h (modified) (5 diffs)
• src/sql_Query.cpp (modified) (11 diffs)
• src/sql_Query.h (modified) (6 diffs)
• src/sql_StderrLog.cpp (modified) (4 diffs)
• src/sql_StderrLog.h (modified) (3 diffs)
• src/sql_SysLog.cpp (modified) (5 diffs)
• src/sql_SysLog.h (modified) (4 diffs)
• src/sql_enum_t.cpp (added)
• src/sql_enum_t.h (added)
• src/sql_set_t.cpp (added)
• src/sql_set_t.h (added)

trunk/ChangeLog

@@ +1 @@
+
+/=/====================================================================================================
+$ Fixes and updates since Build 438/Sql Alpha
+$ Build 438/Sql Alpha
++ Removed all SQLite Code and References.
++ Updated the SQL Wrapper, and all Automake files to now link in and also Detect MySql in the
+  configure scripts.
++ Added detection for OpenSSL, not in use yet, but will add encryption for passwords.
+  and anything else of intertest once everything is moved over to the SQL Backend.
+
+This is still an interm develop update release, the MySql backend is still a WIP, and Husky SMAPI
+will be removed shortly.
 /=/====================================================================================================
 $ Fixes and updates since Build 437/SQlite Alpha

trunk/INSTALL

@@ -2 +2 @@
 ==================
 
-   These are generic installation instructions.
+You can run the install.pl script to install and compile the source in your current
+Directoy.
 
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
+Or you can manally run.
 
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
+$ ./autogen.sh       (detects OS and Platform and generates configure script)
+$ ./configure        (run the configure script to setup make files)
+$ gmake              (gmake or make is fine)
 
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' if you want to change
-it or regenerate `configure' using a newer version of `autoconf'.
+Some dependencies exists, you should have Autotools installed beore running either method.
+Some distro's don't have much installed, so you should check and verify the follow are
+installed before trying to compile.
 
-The simplest way to compile this package is:
+g++ compiler        (c++ compiler)
+libc                (standard library for c/c++)
+sed                 (needed for scripts)
+wget                (downloads programs from the web)
+automake            (Development tools for ccompiling source code)
+libtools            (Used with automake to detect compiling settings)
+Husky SMAPI Lib,    (Install.pl will download and attempt to compile it)
+xinetd / telnetd    (Used for Answering and Handeling Telnet Connections)
+mysql Database/Libs (New - Now Required, still WIP)
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+python              (optional)
+perl                (optional)
+OpenSSL             (Optional)
 
-     Running `configure' takes a while.  While running, it prints some
-     messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
+I believe i have everything here, although it's easy to miss something accross different
+linux/bsd/osx distro's.  If i have, please let me know so we can keep track and make
+getting everything setup easier on everyone.
 
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `configure'
-initial values for variables by setting them in the environment.  Using
-a Bourne-compatible shell, you can do that on the command line like
-this:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-Compiling For Multiple Architectures
-====================================
-
-   You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not supports the `VPATH'
-variable, you have to compile the package for one architecture at a time
-in the source code directory.  After you have installed the package for
-one architecture, use `make distclean' before reconfiguring for another
-architecture.
-
-Installation Names
-==================
-
-   By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-   Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-   There may be some features `configure' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-Sharing Defaults
-================
-
-   If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-

trunk/README

@@ -1 +1 @@
 /=/====================================================================================================
 
-Enthral BBS - 11/17/2009 Build 437/SQ Alpha.
+Enthral BBS - 11/18/2009 Build 438/SQ Alpha.
 
 Interm Release, This release or code sync is just to get the code in development up to date
@@ -10 +10 @@
 Extra Release Notes.
 ##############################################################
-Extra Release Notes, this temp version currently is linking SQLite, if you get any problems
-compiling this source, make sure you have the sqlite3 lib, this will be removed soon though
-as we've changed to MySQL.
+Extra Release Notes, this temp version currently is linking MySql, if you get any problems
+compiling this source, make sure you have the Mysql installed, the software is now moving
+away from the Husky SAMPI (JAM Message Format) to a MySql Database.
 
 
@@ -23 +23 @@
 scripts that will update and compile your current Enthral install via
 the svn.
+
+Basic Installation - PreREQ and small overview.
+==================
+
+You can run the install.pl script to install and compile the source in your current
+Directoy.
+
+Or you can manally run.
+
+$ ./autogen.sh       (detects OS and Platform and generates configure script)
+$ ./configure        (run the configure script to setup make files)
+$ gmake              (gmake or make is fine)
+
+Some dependencies exists, you should have Autotools installed beore running either method.
+Some distro's don't have much installed, so you should check and verify the follow are
+installed before trying to compile.
+
+g++ compiler        (c++ compiler)
+libc                (standard library for c/c++)
+sed                 (needed for scripts)
+wget                (downloads programs from the web)
+automake            (Development tools for ccompiling source code)
+libtools            (Used with automake to detect compiling settings)
+Husky SMAPI Lib,    (Install.pl will download and attempt to compile it)
+xinetd / telnetd    (Used for Answering and Handeling Telnet Connections)
+mysql Database/Libs (New - Now Required, still WIP)
+
+
+python              (optional)
+perl                (optional)
+OpenSSL             (Optional)
+
+I believe i have everything here, although it's easy to miss something accross different
+linux/bsd/osx distro's.  If i have, please let me know so we can keep track and make
+getting everything setup easier on everyone.
+
+MySQL instructions will be coming soon once it's more intergrated and used in the system.
 
 /=/====================================================================================================
@@ -35 +72 @@
 
 You need to have perl installed on your system to use the install script.
+Along with the PreREQ's mentioned above.
 
 /=/====================================================================================================
@@ -164 +202 @@
 Netsurge, Esc, and even pook who have also setup the bbs for testing.
 
-
+-=+[Team Enthral]+=-
 Mike  -Mercyful Fate
 Frank -Netsurge

trunk/configure.in

@@ -8 +8 @@
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
+
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+AC_PROG_CC
+
 
 m4_pattern_allow([^AM_PROG_LIBTOOL$])
@@ -28 +33 @@
 AH_VERBATIM([USING_LINUX],[#undef USING_LINUX])
 AH_VERBATIM([OLD_PERL],[#undef OLD_PERL])
+
+
+dnl *********************************************************************
+dnl ** MYSql ************************************************************
+dnl *********************************************************************
+
+echo Detecting MySQL ...
+
+# mysql autodetected.
+
+# checking for mysql library.
+AC_CHECK_HEADER([mysql/mysql.h])
+AC_PATH_PROG([mysql_config], [mysql_config])
+
+# checking for mysql environment.
+if test "$ac_cv_header_mysql_mysql_h" = "yes" -a -n "$mysql_config"; then
+    MYSQL_CFLAGS="$(mysql_config --cflags)"
+    MYSQL_LDFLAGS="$(mysql_config --libs)"
+    AC_SUBST(MYSQL_CFLAGS)
+    AC_SUBST(MYSQL_LDFLAGS)
+
+    # define the mysql name and version.
+    AC_DEFINE_UNQUOTED(PLUGIN_NAME_MYSQL, "mysql", [Plugin name as Prefix.])
+    AC_DEFINE_UNQUOTED(PLUGIN_VERSION_MYSQL, "$(mysql_config --version)", [Plugin version for MySQL.])
+fi
+
+# define automake rule for compiling.
+AM_CONDITIONAL([HAVE_MYSQL], [test "$ac_cv_header_mysql_mysql_h" = "yes"])
+
+
+# check if no database backends are available, that doesn't make sense for a sql plugin. :)
+if test -z "$ac_cv_header_mysql_mysql_h"; then
+    AC_MSG_ERROR([*** no database backend found, install development and library files])
+fi
 
 
@@ -143 +182 @@
 AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
 
-echo =[Python]=======
+echo =[OpenSSL Detection]====================
+echo checking for OpenSSL for Encryption [Not Yet Implimented].
+# Checking openssl library.
+AC_CHECK_HEADER([openssl/des.h], [], [AC_MSG_ERROR([*** des.h is required, install openssl header files])])
+AC_CHECK_HEADER([openssl/evp.h], [], [AC_MSG_ERROR([*** evp.h is required, install openssl header files])])
+AC_CHECK_LIB([crypto], [EVP_CIPHER_CTX_init], [], [AC_MSG_ERROR([*** EVP_CIPHER_CTX_init is required, install openssl library files])])
+AC_CHECK_LIB([crypto], [EVP_MD_CTX_init], [], [AC_MSG_ERROR([*** EVP_MD_CTX_init is required, install openssl library files])])
+AC_CHECK_LIB([crypto], [DES_crypt], [], [AC_MSG_ERROR([*** DES_crypt is required, install openssl library files])])
+echo =[OpenSSL Detection]====================
+echo
+echo =[Plugin Detection]=====================
+echo =[MySQL]================================
+echo PLUGINS: MySQL: $ac_cv_header_mysql_mysql_h
+echo PLUGINS: MySQL: $MYSQL_CFLAGS
+echo PLUGINS: MySQL: $MYSQL_LDFLAGS
+echo
+echo =[Python]===============================
 echo PLUGINS: Python: $python
 echo PLUGINS: Python: $PY_VER
 echo PLUGINS: Python: $PY_LIB
 echo PLUGINS: Python: $PY_INC
-echo =[Perl - WIP]===
+echo
+echo =[Perl]=================================
 echo PLUGINS: Perl: $perl
 echo PLUGINS: Perl: $PERL_CFLAGS
 echo PLUGINS: Perl: $PERL_LDFLAGS
-echo =[Done]=========
-
+echo =[Done]=================================
+
+AC_SUBST(MYSQL_CFLAGS)
+AC_SUBST(MYSQL_LDFLAGS)
 
 AC_SUBST(PY_CFLAGS)

trunk/enthral.kdevelop

@@ -14 +14 @@
     <projectdirectory>file:///home/merc/enthral/trunk</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <secondaryLanguages/>
     <versioncontrol>kdevsubversion</versioncontrol>
     <projectname>enthral</projectname>
-    <defaultencoding/>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevautoproject>
@@ -98 +98 @@
         <f77compilerbinary/>
         <cflags/>
-        <cxxflags>-m32</cxxflags>
+        <cxxflags/>
         <f77flags/>
       </default>
@@ -236 +236 @@
     <references/>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -262 +262 @@
     <general>
       <programargs/>
-      <gdbpath/>
+      <gdbpath></gdbpath>
       <dbgshell>libtool</dbgshell>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>

trunk/enthral.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="0" />
+ <DocsAndViews NumberOfDocuments="2" >
+  <Doc0 NumberOfViews="1" URL="file:///home/merc/enthral_work/src/sql_set_t.cpp" >
+   <View0 Encoding="" Type="Source" />
+  </Doc0>
+  <Doc1 NumberOfViews="1" URL="file:///home/merc/enthral_work/configure.in" >
+   <View0 Encoding="" line="29" Type="Source" />
+  </Doc1>
+ </DocsAndViews>
  <pluginList>
   <kdevdebugger>

trunk/file_id.diz

@@ -4 +4 @@
 |_____|__|__||____|__|__|__| |___._||__|
 +<:<-------------------------------->:>+
-! build 437 of the enthral bbs system  |
+! build 438 of the enthral bbs system  |
 + for *nix/bsd.  For more info visit:  :
 :                                      +

trunk/src/Makefile.am

@@ -2 +2 @@
 enthral_SOURCES = configbbs.cpp conio.cpp console.cpp data_areas.cpp dtfunc.cpp \
         enthral.cpp file_area.cpp file_edit.cpp file_list.cpp files.cpp history.cpp \
-        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp \
-        sql_Database.cpp sql_Query.cpp sql_StderrLog.cpp sql_SysLog.cpp msg_area.cpp \
+        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp msg_area.cpp \
         msg_edit.cpp msg_email.cpp msg_fse.cpp msg_new.cpp msg_newscan.cpp msg_pack.cpp \
         msg_quote.cpp msg_read.cpp msg_readll.cpp msg_stats.cpp msg_title.cpp msgs.cpp \
-        node.cpp plenthral.cpp pyenthral.cpp user_list.cpp users.cpp
+        node.cpp plenthral.cpp pyenthral.cpp sql_Database.cpp sql_Query.cpp \
+        sql_StderrLog.cpp sql_SysLog.cpp sql_enum_t.cpp sql_set_t.cpp user_list.cpp users.cpp
 
 # set the include path found by configure
@@ -16 +16 @@
 
 
-enthral_LDADD = -lpthread -lsqlite3 libsmapilnx.a $(PY_LIBS)
+enthral_LDADD = $(PY_LIBS) -lpthread -lmysqlclient libsmapilnx.a
 noinst_HEADERS = api_brow.h compiler.h configbbs.h conio.h console.h \
         data_areas.h dtfunc.h file_area.h file_edit.h file_list.h files.h history.h \
-        language.h logon.h main_system.h menu_func.h msg_api.h \
-        sql_Database.h sql_Query.h sql_StderrLog.h sql_SysLog.h sql_IError.h msg_email.h msg_fse.h \
-        msg_email.h msg_fse.h \
+        language.h logon.h main_system.h menu_func.h msg_api.h msg_email.h msg_fse.h \
         msg_new.h msg_pack.h msg_read.h msg_readll.h msg_stats.h msg_title.h msgapi.h \
-        msgs.h node.h stamp.h struct.h typedefs.h user_list.h users.h
+        msgs.h node.h sql_Database.h sql_IError.h sql_Query.h sql_StderrLog.h \
+        sql_SysLog.h sql_enum_t.h sql_set_t.h stamp.h struct.h typedefs.h user_list.h \
+        users.h
 
 

trunk/src/Makefile.in

@@ -57 +57 @@
         file_list.$(OBJEXT) files.$(OBJEXT) history.$(OBJEXT) \
         language.$(OBJEXT) logon.$(OBJEXT) main_system.$(OBJEXT) \
-        menu_func.$(OBJEXT) msg_api.$(OBJEXT) sql_Database.$(OBJEXT) \
-        sql_Query.$(OBJEXT) sql_StderrLog.$(OBJEXT) \
-        sql_SysLog.$(OBJEXT) msg_area.$(OBJEXT) msg_edit.$(OBJEXT) \
-        msg_email.$(OBJEXT) msg_fse.$(OBJEXT) msg_new.$(OBJEXT) \
-        msg_newscan.$(OBJEXT) msg_pack.$(OBJEXT) msg_quote.$(OBJEXT) \
-        msg_read.$(OBJEXT) msg_readll.$(OBJEXT) msg_stats.$(OBJEXT) \
-        msg_title.$(OBJEXT) msgs.$(OBJEXT) node.$(OBJEXT) \
-        plenthral.$(OBJEXT) pyenthral.$(OBJEXT) user_list.$(OBJEXT) \
+        menu_func.$(OBJEXT) msg_api.$(OBJEXT) msg_area.$(OBJEXT) \
+        msg_edit.$(OBJEXT) msg_email.$(OBJEXT) msg_fse.$(OBJEXT) \
+        msg_new.$(OBJEXT) msg_newscan.$(OBJEXT) msg_pack.$(OBJEXT) \
+        msg_quote.$(OBJEXT) msg_read.$(OBJEXT) msg_readll.$(OBJEXT) \
+        msg_stats.$(OBJEXT) msg_title.$(OBJEXT) msgs.$(OBJEXT) \
+        node.$(OBJEXT) plenthral.$(OBJEXT) pyenthral.$(OBJEXT) \
+        sql_Database.$(OBJEXT) sql_Query.$(OBJEXT) \
+        sql_StderrLog.$(OBJEXT) sql_SysLog.$(OBJEXT) \
+        sql_enum_t.$(OBJEXT) sql_set_t.$(OBJEXT) user_list.$(OBJEXT) \
         users.$(OBJEXT)
 enthral_OBJECTS = $(am_enthral_OBJECTS)
 am__DEPENDENCIES_1 =
-enthral_DEPENDENCIES = libsmapilnx.a $(am__DEPENDENCIES_1)
+enthral_DEPENDENCIES = $(am__DEPENDENCIES_1) libsmapilnx.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -120 +121 @@
 FGREP = @FGREP@
 GREP = @GREP@
+HAVE_MYSQL_FALSE = @HAVE_MYSQL_FALSE@
+HAVE_MYSQL_TRUE = @HAVE_MYSQL_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -133 +136 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -195 +200 @@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+mysql_config = @mysql_config@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
@@ -209 +215 @@
 enthral_SOURCES = configbbs.cpp conio.cpp console.cpp data_areas.cpp dtfunc.cpp \
         enthral.cpp file_area.cpp file_edit.cpp file_list.cpp files.cpp history.cpp \
-        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp \
-        sql_Database.cpp sql_Query.cpp sql_StderrLog.cpp sql_SysLog.cpp msg_area.cpp \
+        language.cpp logon.cpp main_system.cpp menu_func.cpp msg_api.cpp msg_area.cpp \
         msg_edit.cpp msg_email.cpp msg_fse.cpp msg_new.cpp msg_newscan.cpp msg_pack.cpp \
         msg_quote.cpp msg_read.cpp msg_readll.cpp msg_stats.cpp msg_title.cpp msgs.cpp \
-        node.cpp plenthral.cpp pyenthral.cpp user_list.cpp users.cpp
+        node.cpp plenthral.cpp pyenthral.cpp sql_Database.cpp sql_Query.cpp \
+        sql_StderrLog.cpp sql_SysLog.cpp sql_enum_t.cpp sql_set_t.cpp user_list.cpp users.cpp
 
 
@@ -221 +227 @@
 # the library search path.
 enthral_LDFLAGS = $(all_libraries)
-enthral_LDADD = -lpthread -lsqlite3 libsmapilnx.a $(PY_LIBS)
+enthral_LDADD = $(PY_LIBS) -lpthread -lmysqlclient libsmapilnx.a
 noinst_HEADERS = api_brow.h compiler.h configbbs.h conio.h console.h \
         data_areas.h dtfunc.h file_area.h file_edit.h file_list.h files.h history.h \
-        language.h logon.h main_system.h menu_func.h msg_api.h \
-        sql_Database.h sql_Query.h sql_StderrLog.h sql_SysLog.h sql_IError.h msg_email.h msg_fse.h \
-        msg_email.h msg_fse.h \
+        language.h logon.h main_system.h menu_func.h msg_api.h msg_email.h msg_fse.h \
         msg_new.h msg_pack.h msg_read.h msg_readll.h msg_stats.h msg_title.h msgapi.h \
-        msgs.h node.h stamp.h struct.h typedefs.h user_list.h users.h
+        msgs.h node.h sql_Database.h sql_IError.h sql_Query.h sql_StderrLog.h \
+        sql_SysLog.h sql_enum_t.h sql_set_t.h stamp.h struct.h typedefs.h user_list.h \
+        users.h
 
 _SOURCES = pyenthral.h plenthral.h
@@ -338 +344 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_StderrLog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_SysLog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_enum_t.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sql_set_t.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/user_list.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@

trunk/src/sql_Database.cpp

@@ -1 @@
-/*
+/**
  **     Database.cpp
  **
- **     Published / author: 2005-08-12 / grymse@alhem.net
+ **     Published / author: 2001-02-15 / grymse@alhem.net
  **/
 
 /*
-Copyright (C) 2001-2006  Anders Hedstrom
+Copyright (C) 2001  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -37 +37 @@
 #include <string>
 #include <map>
+#ifdef WIN32
+#include <config-win.h>
+#include <mysql.h>
+#else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
+#include <mysql/mysql.h>
 #include <stdarg.h>
+#endif
 
 #include "sql_IError.h"
@@ -47 +52 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -72 +77 @@
 
 
+Database::Database(const std::string& h,const std::string& u,const std::string& p,const std::string& d,IError *e)
+:host(h)
+,user(u)
+,password(p)
+,database(d)
+,m_errhandler(e)
+,m_embedded(false)
+,m_mutex(m_mutex)
+,m_b_use_mutex(false)
+{
+}
+
+
+Database::Database(Mutex& m,const std::string& h,const std::string& u,const std::string& p,const std::string& d,IError *e)
+:host(h)
+,user(u)
+,password(p)
+,database(d)
+,m_errhandler(e)
+,m_embedded(false)
+,m_mutex(m)
+,m_b_use_mutex(true)
+{
+}
+
+
 Database::~Database()
 {
@@ -77 +108 @@
         {
                 OPENDB *p = *it;
-                sqlite3_close(p -> db);
+                mysql_close(&p -> mysql);
         }
         while (m_opendbs.size())
@@ -93 +124 @@
 
 
+void Database::OnMyInit(OPENDB *odb)
+{
+        // using embedded server (libmysqld)
+        if (m_embedded)
+        {
+                mysql_options(&odb -> mysql, MYSQL_READ_DEFAULT_GROUP, "test_libmysqld_CLIENT");
+        }
+}
+
+
 void Database::RegErrHandler(IError *p)
 {
@@ -124 +165 @@
                         return NULL;
                 }
-                int rc = sqlite3_open(database.c_str(), &odb -> db);
-                if (rc)
-                {
-                        error("Can't open database: %s\n", sqlite3_errmsg(odb -> db));
-                        sqlite3_close(odb -> db);
+                if (!mysql_init(&odb -> mysql))
+                {
+                        error("mysql_init() failed - list size %d",m_opendbs.size());
                         delete odb;
                         return NULL;
                 }
+                // use callback to set mysql_options() before connect, etc
+                this -> OnMyInit(odb);
+                if (m_embedded)
+                {
+                        if (!mysql_real_connect(&odb -> mysql,NULL,NULL,NULL,database.c_str(),0,NULL,0) )
+                        {
+                                error("mysql_real_connect(NULL,NULL,NULL,%s,0,NULL,0) failed - list size %d",database.c_str(),m_opendbs.size());
+                                delete odb;
+                                return NULL;
+                        }
+                }
+                else
+                {
+                        if (!mysql_real_connect(&odb -> mysql,host.c_str(),user.c_str(),password.c_str(),database.c_str(),0,NULL,0) )
+                        {
+                                error("mysql_real_connect(%s,%s,***,%s,0,NULL,0) failed - list size %d",host.c_str(),user.c_str(),database.c_str(),m_opendbs.size());
+                                delete odb;
+                                return NULL;
+                        }
+                }
                 odb -> busy = true;
                 m_opendbs.push_back(odb);
@@ -137 +196 @@
         else
         {
+                if (mysql_ping(&odb -> mysql))
+                {
+                        error("mysql_ping() failed when reusing an old connection from the connection pool");
+                }
                 odb -> busy = true;
         }
@@ -189 +252 @@
 
 
-void Database::error(Query& q,const std::string& msg)
-{
-        if (m_errhandler)
-        {
-                m_errhandler -> error(*this, q, msg);
-        }
-}
-
-
 bool Database::Connected()
 {
@@ -205 +259 @@
                 return false;
         }
+        int ping_result = mysql_ping(&odb -> mysql);
+        if (ping_result)
+        {
+                error("mysql_ping() failed");
+        }
         freedb(odb);
-        return true;
+        return ping_result ? false : true;
 }
 
@@ -279 +338 @@
                 case '\\':
                 case 34:
-                        str2 += '\'';
+                        str2 += '\\';
                 default:
+                        str2 += str[i];
+                }
+        }
+        return str2;
+}
+
+
+std::string Database::unsafestr(const std::string& str)
+{
+        std::string str2;
+        for (size_t i = 0; i < str.size(); i++)
+        {
+                if (str[i] == '\\')
+                {
+                        i++;
+                }
+                if (i < str.size())
+                {
                         str2 += str[i];
                 }
@@ -346 +423 @@
 }
 
-
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
-#endif
-
+// Added Michael Griffin 11/15/09
+// Custom for Inserting Clean Char *
+char *Database::strip_escape(OPENDB *qodb, char* Oldstr) {
+        
+  char* Newstr = NULL;
+  int ilen=0;
+    
+  if(!Oldstr)
+        return NULL;
+    
+  Newstr = new char[((2 * strlen(Oldstr))+1)];
+        
+  ilen=mysql_real_escape_string(&qodb -> mysql,
+                             (char *)Newstr, 
+                             (char *)Oldstr, 
+                             (long unsigned int)strlen((char *)Oldstr)); 
+                                 
+  Newstr[ilen] = 0;                              
+  return (Newstr);
+}
+
+
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
+#endif
+

trunk/src/sql_Database.h

@@ -1 @@
-/*
+/**
  **     Database.h
  **
- **     Published / author: 2005-08-12 / grymse@alhem.net
+ **     Published / author: 2001-02-15 / grymse@alhem.net
  **/
 
 /*
-Copyright (C) 2001-2006  Anders Hedstrom
+Copyright (C) 2001  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
 
 If you would like to use this program in a closed-source application,
-a separate license agreement is available. For information about
+a separate license agreement is available. For information about 
 the closed-source license agreement for this program, please
 visit http://www.alhem.net/sqlwrapped/license.html and/or
@@ -31 +31 @@
 */
 
-#ifndef _DATABASE_H_SQLITE
-#define _DATABASE_H_SQLITE
+#ifndef _DATABASE_H
+#define _DATABASE_H
 
 #ifdef _WIN32
@@ -48 +48 @@
 #endif
 
-#include <sqlite3.h>
-#include "sql_Database.h"
-
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
-
 
 class IError;
@@ -61 +57 @@
 
 
-/** Connection information and pool. */
-class Database
+/** Connection information and pooling. */
+class Database 
 {
+        /** Mutex container class, used by Lock. 
+                \ingroup threading */
 public:
-        /** Mutex container class, used by Lock.
-                \ingroup threading */
         class Mutex {
         public:
@@ -80 +76 @@
 #endif
         };
+        /** Mutex helper class. */
 private:
-        /** Mutex helper class. */
         class Lock {
         public:
@@ -94 +90 @@
         struct OPENDB {
                 OPENDB() : busy(false) {}
-                sqlite3 *db;
+                MYSQL mysql;
                 bool busy;
         };
         typedef std::list<OPENDB *> opendb_v;
+        
+        // Temp container for strip_escape
+        std::string d_tmpstr;
 
 public:
-        /** Use file */
+        /** Use embedded libmysqld */
         Database(const std::string& database,
                 IError * = NULL);
 
-        /** Use file + thread safe */
+        /** Use embedded libmysqld + thread safe */
         Database(Mutex& ,const std::string& database,
                 IError * = NULL);
 
+        /** Connect to a MySQL server */
+        Database(const std::string& host,
+                const std::string& user,
+                const std::string& password = "",
+                const std::string& database = "",
+                IError * = NULL);
+
+        /** Connect to a MySQL server + thread safe */
+        Database(Mutex& ,const std::string& host,
+                const std::string& user,
+                const std::string& password = "",
+                const std::string& database = "",
+                IError * = NULL);
+
         virtual ~Database();
+
+        /** Callback after mysql_init */
+        virtual void OnMyInit(OPENDB *);
 
         /** try to establish connection with given host */
@@ -115 +131 @@
         void RegErrHandler(IError *);
         void error(Query&,const char *format, ...);
-        void error(Query&,const std::string& );
 
         /** Request a database connection.
@@ -135 +150 @@
         void freedb(OPENDB *odb);
 
-        /** Escape string - change all ' to ''. */
+        // utility
         std::string safestr(const std::string& );
-        /** Make string xml safe. */
+        std::string unsafestr(const std::string& );
         std::string xmlsafestr(const std::string& );
 
-        /** Convert string to 64-bit integer. */
         int64_t a2bigint(const std::string& );
-        /** Convert string to unsigned 64-bit integer. */
         uint64_t a2ubigint(const std::string& );
+        
+        char *strip_escape(OPENDB *qodb, char* Oldstr);
 
 private:
@@ -150 +165 @@
         void error(const char *format, ...);
         //
+        std::string host;
+        std::string user;
+        std::string password;
         std::string database;
         opendb_v m_opendbs;
@@ -158 +176 @@
 };
 
-
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} //namespace MYSQLW_NAMESPACE {
 #endif
 
+
 #endif // _DATABASE_H

trunk/src/sql_IError.h

@@ -1 @@
-/*
+/**
  **     IError.h
  **
@@ -6 +6 @@
 
 /*
-Copyright (C) 2004,2005,2006  Anders Hedstrom
+Copyright (C) 2004  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -31 +31 @@
 */
 
-#ifndef _IERROR_H_SQLITE
-#define _IERROR_H_SQLITE
+#ifndef _IERROR_H
+#define _IERROR_H
 
 #include <string>
 
-
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -44 +43 @@
 class Database;
 class Query;
-
 
 /** Log class interface. */
@@ -55 +53 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 

trunk/src/sql_Query.cpp

@@ -1 @@
-/*
+/**
  **     Query.cpp
  **
- **     Published / author: 2005-08-12 / grymse@alhem.net
+ **     Published / author: 2001-02-15 / grymse@alhem.net
  **/
 
 /*
-Copyright (C) 2001-2006  Anders Hedstrom
+Copyright (C) 2001  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -36 +36 @@
 #include <string>
 #include <map>
+#ifdef WIN32
+#include <config-win.h>
+#include <mysql.h>
+#else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
+#include <mysql/mysql.h>
+#endif
 
 #include "sql_Database.h"
@@ -45 +50 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
 
-Query::Query(Database& dbin) 
-: m_db(dbin)
-,odb(dbin.grabdb())
+Query::Query(Database *dbin)
+:m_db(*dbin)
+,odb(dbin ? dbin -> grabdb() : NULL)
 ,res(NULL)
-,row(false)
-,cache_rc(0)
-,cache_rc_valid(false)
-,m_row_count(0)
+,row(NULL)
 ,m_num_cols(0)
 {
@@ -63 +65 @@
 
 
-Query::Query(Database& dbin,const std::string& sql) 
-: m_db(dbin)
-,odb(dbin.grabdb())
-,res(NULL)
-,row(false)
-,cache_rc(0)
-,cache_rc_valid(false)
-,m_row_count(0)
+Query::Query(Database& dbin) : m_db(dbin),odb(dbin.grabdb()),res(NULL),row(NULL)
 ,m_num_cols(0)
 {
+}
+
+
+Query::Query(Database *dbin,const std::string& sql) : m_db(*dbin)
+,odb(dbin ? dbin -> grabdb() : NULL),res(NULL),row(NULL)
+,m_num_cols(0)
+{
         execute(sql);
 }
 
 
+Query::Query(Database& dbin,const std::string& sql) : m_db(dbin),odb(dbin.grabdb()),res(NULL),row(NULL)
+,m_num_cols(0)
+{
+        execute(sql); // returns 0 if fail
+}
+
+
 Query::~Query()
 {
         if (res)
         {
-                GetDatabase().error(*this, "sqlite3_finalize in destructor");
-                sqlite3_finalize(res);
+                GetDatabase().error(*this, "mysql_free_result in destructor");
+                mysql_free_result(res);
         }
         if (odb)
@@ -97 +106 @@
 
 
-/*
-The sqlite3_finalize() routine deallocates a prepared SQL statement. 
-All prepared statements must be finalized before the database can be closed.
-*/
 bool Query::execute(const std::string& sql)
-{
-        // query, no result
+{               // query, no result
         m_last_query = sql;
         if (odb && res)
@@ -111 +115 @@
         if (odb && !res)
         {
-                const char *s = NULL;
-                int rc = sqlite3_prepare(odb -> db, sql.c_str(), sql.size(), &res, &s);
-                if (rc != SQLITE_OK)
-                {
-                        GetDatabase().error(*this, "execute: prepare query failed");
-                        return false;
-                }
-                if (!res)
-                {
-                        GetDatabase().error(*this, "execute: query failed");
-                        return false;
-                }
-                rc = sqlite3_step(res); // execute
-                sqlite3_finalize(res); // deallocate statement
+                if (mysql_query(&odb -> mysql,sql.c_str()))
+                {
+                        GetDatabase().error(*this,"query failed");
+                }
+                else
+                {
+                        return true;
+                }
+        }
+        return false;
+}
+
+
+
+// methods using db specific api calls
+
+MYSQL_RES *Query::get_result(const std::string& sql)
+{       // query, result
+        if (odb && res)
+        {
+                GetDatabase().error(*this, "get_result: query busy");
+        }
+        if (odb && !res)
+        {
+                if (execute(sql))
+                {
+                        res = mysql_store_result(&odb -> mysql);
+                        if (res)
+                        {
+                                MYSQL_FIELD *f = mysql_fetch_field(res);
+                                int i = 1;
+                                while (f)
+                                {
+                                        if (f -> name)
+                                                m_nmap[f -> name] = i;
+                                        f = mysql_fetch_field(res);
+                                        i++;
+                                }
+                                m_num_cols = i - 1;
+                        }
+                }
+        }
+        return res;
+}
+
+
+void Query::free_result()
+{
+        if (odb && res)
+        {
+                mysql_free_result(res);
                 res = NULL;
-                switch (rc)
-                {
-                case SQLITE_BUSY:
-                        GetDatabase().error(*this, "execute: database busy");
-                        return false;
-                case SQLITE_DONE:
-                case SQLITE_ROW:
-                        return true;
-                case SQLITE_ERROR:
-                        GetDatabase().error(*this, sqlite3_errmsg(odb -> db));
-                        return false;
-                case SQLITE_MISUSE:
-                        GetDatabase().error(*this, "execute: database misuse");
-                        return false;
-                }
-                GetDatabase().error(*this, "execute: unknown result code");
-        }
-        return false;
-}
-
-
-
-// methods using db specific api calls
-
-sqlite3_stmt *Query::get_result(const std::string& sql)
-{
-        // query, result
-        m_last_query = sql;
-        if (odb && res)
-        {
-                GetDatabase().error(*this, "get_result: query busy");
-        }
-        if (odb && !res)
-        {
-                const char *s = NULL;
-                int rc = sqlite3_prepare(odb -> db, sql.c_str(), sql.size(), &res, &s);
-                if (rc != SQLITE_OK)
-                {
-                        GetDatabase().error(*this, "get_result: prepare query failed");
-                        return NULL;
-                }
-                if (!res)
-                {
-                        GetDatabase().error(*this, "get_result: query failed");
-                        return NULL;
-                }
-                // get column names from result
-                {
-                        int i = 0;
-                        do
-                        {
-                                const char *p = sqlite3_column_name(res, i);
-                                if (!p)
-                                        break;
-                                m_nmap[p] = ++i;
-                        } while (true);
-                        m_num_cols = i;
-                }
-                cache_rc = sqlite3_step(res);
-                cache_rc_valid = true;
-                m_row_count = (cache_rc == SQLITE_ROW) ? 1 : 0;
-        }
-        return res;
-}
-
-
-void Query::free_result()
-{
-        if (odb && res)
-        {
-                sqlite3_finalize(res);
-                res = NULL;
-                row = false;
-                cache_rc_valid = false;
-        }
-        // clear column names
+                row = NULL;
+        }
         while (m_nmap.size())
         {
@@ -207 +174 @@
                 m_nmap.erase(it);
         }
-}
-
-
-bool Query::fetch_row()
+        m_num_cols = 0;
+}
+
+
+MYSQL_ROW Query::fetch_row()
 {
         rowcount = 0;
-        row = false;
-        if (odb && res)
-        {
-                int rc = cache_rc_valid ? cache_rc : sqlite3_step(res); // execute
-                cache_rc_valid = false;
-                switch (rc)
-                {
-                case SQLITE_BUSY:
-                        GetDatabase().error(*this, "execute: database busy");
-                        return false;
-                case SQLITE_DONE:
-                        return false;
-                case SQLITE_ROW:
-                        row = true;
-                        return true;
-                case SQLITE_ERROR:
-                        GetDatabase().error(*this, sqlite3_errmsg(odb -> db));
-                        return false;
-                case SQLITE_MISUSE:
-                        GetDatabase().error(*this, "execute: database misuse");
-                        return false;
-                }
-                GetDatabase().error(*this, "execute: unknown result code");
-        }
+        return odb && res ? row = mysql_fetch_row(res) : NULL;
+}
+
+
+my_ulonglong Query::insert_id()
+{
+        if (odb)
+        {
+                return mysql_insert_id(&odb -> mysql);
+        }
+        else
+        {
+                return 0;
+        }
+}
+
+
+long Query::num_rows()
+{
+        return odb && res ? mysql_num_rows(res) : 0;
+}
+
+
+int Query::num_cols()
+{
+        return m_num_cols;
+}
+
+
+bool Query::is_null(int x)
+{
+        if (odb && res && row)
+        {
+                return row[x] ? false : true;
+        }
+        return false; // ...
+}
+
+
+bool Query::is_null(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return is_null(index);
+        error("Column name lookup failure: " + x);
         return false;
 }
 
 
-sqlite_int64 Query::insert_id()
-{
-        if (odb)
-        {
-                return sqlite3_last_insert_rowid(odb -> db);
-        }
-        else
-        {
-                return 0;
-        }
-}
-
-
-long Query::num_rows()
-{
-        return odb && res ? m_row_count : 0;
-}
-
-
-int Query::num_cols()
-{
-        return m_num_cols;
-}
-
-
-bool Query::is_null(int x)
+bool Query::is_null()
+{
+        return is_null(rowcount++);
+}
+
+
+const char *Query::getstr(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return getstr(index);
+        error("Column name lookup failure: " + x);
+        return NULL;
+}
+
+
+const char *Query::getstr(int x)
 {
         if (odb && res && row)
         {
-                if (sqlite3_column_type(res, x) == SQLITE_NULL)
-                        return true;
-        }
-        return false; // ...
-}
-
-
-const char *Query::getstr(const std::string& x)
-{
-        int index = m_nmap[x] - 1;
-        if (index >= 0)
-                return getstr(index);
-        error("Column name lookup failure: " + x);
-        return "";
-}
-
-
-const char *Query::getstr(int x)
-{
-        if (odb && res && row && x < sqlite3_column_count(res) )
-        {
-                const unsigned char *tmp = sqlite3_column_text(res, x);
-                return tmp ? (const char *)tmp : "";
-        }
-        return "";
+                return row[x] ? row[x] : "";
+        }
+        return NULL;
 }
 
@@ -316 +274 @@
 double Query::getnum(int x)
 {
-        if (odb && res && row)
-        {
-                return sqlite3_column_double(res, x);
-        }
+        return odb && res && row && row[x] ? atof(row[x]) : 0;
+}
+
+
+long Query::getval(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return getval(index);
+        error("Column name lookup failure: " + x);
         return 0;
 }
 
 
-long Query::getval(const std::string& x)
-{
-        int index = m_nmap[x] - 1;
-        if (index >= 0)
-                return getval(index);
+long Query::getval(int x)
+{
+        return odb && res && row && row[x] ? atol(row[x]) : 0;
+}
+
+
+double Query::getnum()
+{
+        return getnum(rowcount++);
+}
+
+
+long Query::getval()
+{
+        return getval(rowcount++);
+}
+
+
+unsigned long Query::getuval(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return getuval(index);
         error("Column name lookup failure: " + x);
         return 0;
@@ -334 +316 @@
 
 
-long Query::getval(int x)
-{
-        if (odb && res && row)
-        {
-                return sqlite3_column_int(res, x);
-        }
+unsigned long Query::getuval(int x)
+{
+        unsigned long l = 0;
+        if (odb && res && row && row[x])
+        {
+                l = m_db.a2ubigint(row[x]);
+        }
+        return l;
+}
+
+
+unsigned long Query::getuval()
+{
+        return getuval(rowcount++);
+}
+
+
+int64_t Query::getbigint(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return getbigint(index);
+        error("Column name lookup failure: " + x);
         return 0;
 }
 
 
-double Query::getnum()
-{
-        return getnum(rowcount++);
-}
-
-
-long Query::getval()
-{
-        return getval(rowcount++);
-}
-
-
-unsigned long Query::getuval(const std::string& x)
-{
-        int index = m_nmap[x] - 1;
-        if (index >= 0)
-                return getuval(index);
+int64_t Query::getbigint(int x)
+{
+        return odb && res && row && row[x] ? m_db.a2bigint(row[x]) : 0;
+}
+
+
+int64_t Query::getbigint()
+{
+        return getbigint(rowcount++);
+}
+
+
+uint64_t Query::getubigint(const std::string& x)
+{
+        int index = m_nmap[x] - 1;
+        if (index >= 0)
+                return getubigint(index);
         error("Column name lookup failure: " + x);
         return 0;
@@ -366 +365 @@
 
 
-unsigned long Query::getuval(int x)
-{
-        unsigned long l = 0;
-        if (odb && res && row)
-        {
-                l = sqlite3_column_int(res, x);
-        }
-        return l;
-}
-
-
-unsigned long Query::getuval()
-{
-        return getuval(rowcount++);
-}
-
-
-int64_t Query::getbigint(const std::string& x)
-{
-        int index = m_nmap[x] - 1;
-        if (index >= 0)
-                return getbigint(index);
-        error("Column name lookup failure: " + x);
-        return 0;
-}
-
-
-int64_t Query::getbigint(int x)
-{
-        if (odb && res && row)
-        {
-                return sqlite3_column_int64(res, x);
-        }
-        return 0;
-}
-
-
-int64_t Query::getbigint()
-{
-        return getbigint(rowcount++);
-}
-
-
-uint64_t Query::getubigint(const std::string& x)
-{
-        int index = m_nmap[x] - 1;
-        if (index >= 0)
-                return getubigint(index);
-        error("Column name lookup failure: " + x);
-        return 0;
-}
-
-
 uint64_t Query::getubigint(int x)
 {
-        uint64_t l = 0;
-        if (odb && res && row)
-        {
-                l = sqlite3_column_int64(res, x);
-        }
-        return l;
+        return odb && res && row && row[x] ? m_db.a2ubigint(row[x]) : 0;
 }
 
@@ -489 +430 @@
 std::string Query::GetError()
 {
+        return odb ? mysql_error(&odb -> mysql) : "";
+}
+
+
+int Query::GetErrno()
+{
+        return odb ? mysql_errno(&odb -> mysql) : 0;
+}
+
+
+bool Query::Connected()
+{
         if (odb)
-                return sqlite3_errmsg(odb -> db);
-        return "";
-}
-
-
-int Query::GetErrno()
-{
-        if (odb)
-                return sqlite3_errcode(odb -> db);
-        return 0;
-}
-
-
-bool Query::Connected()
-{
+        {
+                if (mysql_ping(&odb -> mysql))
+                {
+                        GetDatabase().error(*this, "mysql_ping() failed");
+                        return false;
+                }
+        }
         return odb ? true : false;
 }
 
 
-
-
-void Query::ViewRes()
-{
-        if (!res)
-        {
-                printf("no result stored\n");
-                return;
-        }
-        printf("result column count = %d\n", sqlite3_column_count(res));
-        for (int i = 0; i < sqlite3_column_count(res); i++)
-        {
-                printf(" %2d   type %d   name '%s'", i, sqlite3_column_type(res, i), sqlite3_column_name(res, i));
-                printf("  / '%s'", (char *)sqlite3_column_text(res, i));
-                printf("  / %d", sqlite3_column_int(res, i));
-                printf("  / %f", sqlite3_column_double(res, i));
-                printf("\n");
-        }
-}
-
-
-void Query::error(const std::string& msg)
-{
-        GetDatabase().error(*this, msg);
-}
-
-
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+void Query::error(const std::string& x)
+{
+        m_db.error(*this, x.c_str());
+}
+
+
+std::string Query::safestr(const std::string& x)
+{
+        return m_db.safestr(x);
+}
+
+// Added Michael Griffin 11/15/09
+// Custom 'mysql_real_escape_string()'
+char *Query::strip(char* Oldstr) 
+{
+    return m_db.strip_escape(odb,Oldstr);
+}
+
+
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 

trunk/src/sql_Query.h

@@ -5 +5 @@
  **     Query.h
  **
- **     Published / author: 2005-08-12 / grymse@alhem.net
+ **     Published / author: 2001-02-15 / grymse@alhem.net
  **/
 
 /*
-Copyright (C) 2001-2006  Anders Hedstrom
+Copyright (C) 2001  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -34 +34 @@
 */
 
-#ifndef _QUERY_H_SQLITE
-#define _QUERY_H_SQLITE
+#ifndef _QUERY_H
+#define _QUERY_H
 
 #include <string>
@@ -47 +47 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
 
-/** SQL Statement execute / result. */
+/** SQL Statement execute / result set helper class. */
 class Query 
 {
@@ -59 +59 @@
         Query(Database& dbin);
         /** Constructor accepting reference to database object
-                and query string to execute. */
+                and query to execute. */
         Query(Database& dbin,const std::string& sql);
         ~Query();
 
-        /** Check if database object is connectable. */
+        /** Check to see if database object is connectable. */
         bool Connected();
         /** Return reference to database object. */
         Database& GetDatabase() const;
-        /** Return string containing last query executed. */
+        /** Return string of last query executed. */
         const std::string& GetLastQuery();
 
         /** execute() returns true if query is successful,
-                does not store result. */
+                does not store result */
         bool execute(const std::string& sql);
+        /** execute query and store result. */
+        MYSQL_RES *get_result(const std::string& sql);
 
-        /** Execute query and store result. */
-        sqlite3_stmt *get_result(const std::string& sql);
-        /** Free stored result, must be called after get_result() before calling 
-                execute()/get_result() again. */
+        /** free stored result, must be called after get_result() */
         void free_result();
         /** Fetch next result row.
                 \return false if there was no row to fetch (end of rows) */
-        bool fetch_row();
+        MYSQL_ROW fetch_row();
         /** Get id of last insert. */
-        sqlite_int64 insert_id();
-        /** Returns 0 if there are no rows to fetch. */
+        my_ulonglong insert_id();
+        /** Returns number of rows returned by last select call. */
         long num_rows();
         /** Number of columns in current result. */
@@ -94 +93 @@
 
         /** Check if column x in current row is null. */
+        bool is_null(const std::string& x);
         bool is_null(int x);
+        bool is_null();
 
         /** Execute query and return first result as a string. */
@@ -103 +104 @@
         double get_num(const std::string& sql);
 
-        /** Return column named x as a string value. */
         const char *getstr(const std::string& x);
-        /** Return column x as a string value. */
         const char *getstr(int x);
-        /** Return next column as a string value - see rowcount. */
         const char *getstr();
-
-        /** Return column named x as a long integer. */
         long getval(const std::string& x);
-        /** Return column x as a long integer. */
         long getval(int x);
-        /** Return next column as a long integer - see rowcount. */
         long getval();
-
-        /** Return column named x as an unsigned long integer. */
         unsigned long getuval(const std::string& x);
-        /** Return column x as an unsigned long integer. */
         unsigned long getuval(int x);
-        /** Return next column as an unsigned long integer. */
         unsigned long getuval();
-
-        /** Return column named x as a 64-bit integer value. */
         int64_t getbigint(const std::string& x);
-        /** Return column x as a 64-bit integer value. */
         int64_t getbigint(int x);
-        /** Return next column as a 64-bit integer value. */
         int64_t getbigint();
-
-        /** Return column named x as an unsigned 64-bit integer value. */
         uint64_t getubigint(const std::string& x);
-        /** Return column x as an unsigned 64-bit integer value. */
         uint64_t getubigint(int x);
-        /** Return next column as an unsigned 64-bit integer value. */
         uint64_t getubigint();
-
-        /** Return column named x as a double. */
         double getnum(const std::string& x);
-        /** Return column x as a double. */
         double getnum(int x);
-        /** Return next column as a double. */
         double getnum();
 
+        std::string safestr(const std::string& x);
+        char *strip(char* Oldstr);
+
+protected:
+        Query(Database *dbin);
+        Query(Database *dbin,const std::string& sql);
 private:
-        /** Hide the copy constructor. */
         Query(const Query& q) : m_db(q.GetDatabase()) {}
-        /** Hide the assignment operator. */
         Query& operator=(const Query& ) { return *this; }
-        /** Print current result to stdout. */
-        void ViewRes();
-        /** Print error to debug class. */
         void error(const std::string& );
-        Database& m_db; ///< Reference to database object
-        Database::OPENDB *odb; ///< Connection pool handle
-        sqlite3_stmt *res; ///< Stored result
-        bool row; ///< true if fetch_row succeeded
-        short rowcount; ///< Current column pointer in result
-        std::string m_tmpstr; ///< Used to store result in get_string() call
-        std::string m_last_query; ///< Last query executed
-        int cache_rc; ///< Cached result after call to get_result()
-        bool cache_rc_valid; ///< Indicates cache_rc is valid
-        int m_row_count; ///< 0 if get_result() returned no rows
-        //
-        std::map<std::string,int> m_nmap; ///< map translating column names to index
-        int m_num_cols; ///< number of columns in result
+        Database& m_db;
+        Database::OPENDB *odb;
+        MYSQL_RES *res;
+        MYSQL_ROW row;
+        short rowcount;
+        std::string m_tmpstr;
+        std::string m_last_query;
+        std::map<std::string,int> m_nmap;
+        int m_num_cols;
 };
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 

trunk/src/sql_StderrLog.cpp

@@ -1 @@
-/*
+/**
  **     StderrLog.cpp
  **
@@ -6 +6 @@
 
 /*
-Copyright (C) 2004,2005,2006  Anders Hedstrom
+Copyright (C) 2004  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -37 +37 @@
 #include <string>
 #include <map>
+#ifdef WIN32
+#include <config-win.h>
+#include <mysql.h>
 #include <time.h>
-#include <sqlite3.h>
+#else
+#include <mysql/mysql.h>
+#endif
 
 #include "sql_Database.h"
 #include "sql_Query.h"
-#include "sql_IError.h"
+//#include "sql_IError.h"
 #include "sql_StderrLog.h"
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -74 +79 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 

trunk/src/sql_StderrLog.h

@@ -6 +6 @@
 
 /*
-Copyright (C) 2004,2005,2006  Anders Hedstrom
+Copyright (C) 2004  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -30 +30 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef _STDERRLOG_H_SQLITE
-#define _STDERRLOG_H_SQLITE
+#ifndef _STDERRLOG_H
+#define _STDERRLOG_H
 
-
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
+#include "sql_Database.h"
+#include "sql_IError.h"
 
-/** Log class writing to standard error. */
+/** Log class writing to stderr. */
 class StderrLog : public IError
 {
@@ -50 +51 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 
+
 #endif // _STDERRLOG_H

trunk/src/sql_SysLog.cpp

@@ -1 @@
-/*
+/**
  **     SysLog.cpp
  **
@@ -6 +6 @@
 
 /*
-Copyright (C) 2004,2005,2006  Anders Hedstrom
+Copyright (C) 2004  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
 
 If you would like to use this program in a closed-source application,
-a separate license agreement is available. For information about
+a separate license agreement is available. For information about 
 the closed-source license agreement for this program, please
 visit http://www.alhem.net/sqlwrapped/license.html and/or
@@ -32 +32 @@
 #ifndef WIN32
 
-#include <cstring>
-#include <sqlite3.h>
+#include <mysql/mysql.h>
 #include <syslog.h>
 
+#include <cstdio>
+#include <cstring>
 #include "sql_Database.h"
 #include "sql_Query.h"
@@ -42 +43 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -74 +75 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif
 

trunk/src/sql_SysLog.h

@@ -1 @@
-/*
+/**
  **     SysLog.h
  **
@@ -6 +6 @@
 
 /*
-Copyright (C) 2004,2005,2006  Anders Hedstrom
+Copyright (C) 2004  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
 
 If you would like to use this program in a closed-source application,
-a separate license agreement is available. For information about
+a separate license agreement is available. For information about 
 the closed-source license agreement for this program, please
 visit http://www.alhem.net/sqlwrapped/license.html and/or
@@ -30 +30 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#ifndef _SYSLOG_H_SQLITE
-#define _SYSLOG_H_SQLITE
+#ifndef _SYSLOG_H
+#define _SYSLOG_H
 #ifndef WIN32
 
-#include <sql_SysLog.h>
+#include <syslog.h>
 
-
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -56 +55 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
 #endif