added fix for bug #536

not libodbc++ reads BIGINTs correclty with getLong()

livesupport/Makefile

@@ -20,8 +20,8 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-#   Author   : $Author: tomas $
+#   Author   : $Author: maroy $
-#   Version  : $Revision: 1.28 $
+#   Version  : $Revision: 1.29 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $
 #-------------------------------------------------------------------------------
 
@@ -71,7 +71,7 @@ LIBXMLXX_VERSION  = libxml++-2.8.1
 CXXUNIT_DIR       = ${TOOLS_DIR}/cppunit
 CXXUNIT_VERSION   = cppunit-1.10.2
 LIBODBCXX_DIR     = ${TOOLS_DIR}/libodbc++
-LIBODBCXX_VERSION = libodbc++-0.2.3
+LIBODBCXX_VERSION = libodbc++-0.2.3-20050404
 XMLRPCXX_DIR      = ${TOOLS_DIR}/xmlrpc++
 XMLRPCXX_VERSION  = xmlrpc++-20040713
 LCOV_DIR          = ${TOOLS_DIR}/lcov

livesupport/bin/dist.sh

@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.2 $
+#   Version  : $Revision: 1.3 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/dist.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ cxxunit_version=cppunit-1.10.2
 cxxunit_tmpdir=$tools_tmpdir/cppunit
 
 libodbcxx_dir=$toolsdir/libodbc++
-libodbcxx_version=libodbc++-0.2.3
+libodbcxx_version=libodbc++-0.2.3-20050404
 libodbcxx_tmpdir=$tools_tmpdir/libodbc++
 
 xmlrpcxx_dir=$toolsdir/xmlrpc++

livesupport/modules/db/etc/Makefile.in

@@ -21,7 +21,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.7 $
+#   Version  : $Revision: 1.8 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $
 #
 #   @configure_input@
@@ -66,6 +66,8 @@ VPATH    = ${SRC_DIR}
 
 LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
 LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
+LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@
+LIBODBCXX_LIBS=@LIBODBCXX_LIBS@
 
 TEST_RESULTS = ${DOC_DIR}/testResults.xml
 # the text result XSLT has to be relative to the test result file, e.g. TMP_DIR
@@ -87,12 +89,14 @@ CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -pedantic -Wall -Wno-long-long \
                              ${LIBXMLPP_CFLAGS} \
+							 ${LIBODBCXX_CFLAGS} \
                              -I${USR_INCLUDE_DIR} \
                              -I${BOOST_INCLUDE_DIR} \
                              -I${CORE_INCLUDE_DIR} \
                              -I${INCLUDE_DIR} -I${TMP_DIR}
 LDFLAGS  = @LDFLAGS@ -pthread \
                      ${LIBXMLPP_LIBS} \
+					 ${LIBODBCXX_LIBS} \
                      -L${USR_LIB_DIR} \
                      -L${CORE_LIB_DIR} \
                      -L${LIB_DIR}
@@ -107,7 +111,7 @@ DB_LIB_OBJS = ${TMP_DIR}/SimpleConnectionManager.o \
 TEST_RUNNER_OBJS = ${TMP_DIR}/SimpleConnectionManagerTest.o \
                    ${TMP_DIR}/ConnectionManagerFactoryTest.o \
                    ${TMP_DIR}/TestRunner.o
-TEST_RUNNER_LIBS = -l${DB_LIB} -l${CORE_LIB} -lodbc++ -lcppunit -ldl
+TEST_RUNNER_LIBS = -l${DB_LIB} -l${CORE_LIB} -lcppunit -ldl
 
 
 #-------------------------------------------------------------------------------

livesupport/modules/db/etc/configure.ac

@@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl
 dnl Author   : $Author: maroy $
-dnl Version  : $Revision: 1.5 $
+dnl Version  : $Revision: 1.6 $
 dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/configure.ac,v $
 dnl-----------------------------------------------------------------------------
 
@@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
 AC_INIT(Db, 1.0, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
-AC_REVISION($Revision: 1.5 $)
+AC_REVISION($Revision: 1.6 $)
 
 AC_CONFIG_SRCDIR(../include/LiveSupport/Db/ConnectionManagerInterface.h)
 
@@ -45,6 +45,7 @@ AC_PROG_CXX()
 AC_CHECK_HEADERS(getopt.h)
 
 PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0])
+PKG_CHECK_MODULES(LIBODBCXX,[libodbc++])
 AC_SUBST(LIBXMLPP_CFLAGS)
 AC_SUBST(LIBXMLPP_LIBS)
 

livesupport/products/scheduler/etc/Makefile.in

@@ -20,8 +20,8 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-#   Author   : $Author: fgerlits $
+#   Author   : $Author: maroy $
-#   Version  : $Revision: 1.50 $
+#   Version  : $Revision: 1.51 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $
 #
 #   @configure_input@
@@ -64,6 +64,8 @@ VPATH    = ${SRC_DIR}
 
 LIBXMLPP_CFLAGS=@LIBXMLPP_CFLAGS@
 LIBXMLPP_LIBS=@LIBXMLPP_LIBS@
+LIBODBCXX_CFLAGS=@LIBODBCXX_CFLAGS@
+LIBODBCXX_LIBS=@LIBODBCXX_LIBS@
 
 CURL_LIBS=`${USR_DIR}/bin/curl-config --libs`
 
@@ -131,6 +133,7 @@ CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -pedantic -Wall -Wno-long-long \
                              ${LIBXMLPP_CFLAGS} \
+							 ${LIBODBCXX_CFLAGS} \
                              ${TAGLIB_CFLAGS} \
                              -I${USR_INCLUDE_DIR} \
                              -I${BOOST_INCLUDE_DIR} \
@@ -143,6 +146,7 @@ CXXFLAGS = @CXXFLAGS@ @DEFS@ @COVERAGE_CXXFLAGS@ -pthread \
                              -I${TMP_DIR}
 LDFLAGS  = @LDFLAGS@ -pthread \
                      ${LIBXMLPP_LIBS} \
+					 ${LIBODBCXX_LIBS} \
                      ${CURL_LIBS} \
                      ${TAGLIB_LIBS} \
                      -L${USR_LIB_DIR} \
@@ -198,7 +202,7 @@ SCHEDULER_EXE_LIBS = -l${EVENT_SCHEDULER_LIB} -l${PLAYLIST_EXECUTOR_LIB} \
                      -l${STORAGE_LIB} -l${DB_LIB} -l${AUTHENTICATION_LIB} \
                      -l${CORE_LIB} \
                      ${HELIX_LIBS} \
-                     -lodbc++ -lboost_date_time-gcc \
+                     -lboost_date_time-gcc \
                      -lxmlrpc++ -lssl
 
 TEST_RUNNER_OBJS = ${SCHEDULER_OBJS} \

livesupport/products/scheduler/etc/configure.ac

@@ -21,7 +21,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 dnl
 dnl
 dnl Author   : $Author: maroy $
-dnl Version  : $Revision: 1.6 $
+dnl Version  : $Revision: 1.7 $
 dnl Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/configure.ac,v $
 dnl-----------------------------------------------------------------------------
 
@@ -35,7 +35,7 @@ dnl-----------------------------------------------------------------------------
 AC_INIT(Scheduler, 0.1, bugs@campware.org)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2004 Media Development Loan Fund under the GNU GPL])
-AC_REVISION($Revision: 1.6 $)
+AC_REVISION($Revision: 1.7 $)
 
 AC_CONFIG_SRCDIR(../src/main.cxx)
 
@@ -46,6 +46,7 @@ AC_CHECK_HEADERS(sys/types.h unistd.h getopt.h signal.h sys/stat.h time.h)
 AC_CHECK_HEADERS(stdio.h fcntl.h sys/time.h)
 
 PKG_CHECK_MODULES(LIBXMLPP,[libxml++-2.6 >= 2.6.0])
+PKG_CHECK_MODULES(LIBODBCXX,[libodbc++])
 AC_SUBST(LIBXMLPP_CFLAGS)
 AC_SUBST(LIBXMLPP_LIBS)
 

livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/install.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#-------------------------------------------------------------------------------
+#   Copyright (c) 2004 Media Development Loan Fund
+#
+#   This file is part of the LiveSupport project.
+#   http://livesupport.campware.org/
+#   To report bugs, send an e-mail to bugs@campware.org
+#
+#   LiveSupport is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   LiveSupport is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with LiveSupport; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+#   Author   : $Author: maroy $
+#   Version  : $Revision: 1.1 $
+#   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/bin/Attic/install.sh,v $
+#-------------------------------------------------------------------------------                                                                                
+#-------------------------------------------------------------------------------
+# Run this script to install libodbc++ into the development system usr
+# environment.
+# To read more about libodbc++, see http://libodbcxx.sourceforge.net/
+#-------------------------------------------------------------------------------
+product=libodbc++-0.2.3-20050404
+
+reldir=`dirname $0`/..
+basedir=`cd $reldir; pwd;`
+installdir=`cd $basedir/../../../usr; pwd;`
+tmpdir=$basedir/tmp
+etcdir=$basedir/etc
+tar=$basedir/src/$product.tar.bz2
+
+echo "installing $product from $basedir to $installdir"
+
+
+mkdir -p $tmpdir
+cd $tmpdir
+
+tar xfj $tar
+cd $product
+patch -p1 < $etcdir/libodbc++-no-namespace-closing-colon.patch
+patch -p1 < $etcdir/libodbc++-no-thread-dmaccess-mutex-fix.patch
+patch -p1 < $etcdir/libodbc++-dont-install-some-docs.patch
+./configure --enable-threads --prefix=$installdir
+make install
+
+cd $basedir
+rm -rf tmp
+

livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-dont-install-some-docs.patch

@@ -0,0 +1,25 @@
+diff -Naur libodbc++-0.2.3-20050404/doc/Makefile.am libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am
+--- libodbc++-0.2.3-20050404/doc/Makefile.am	2001-06-12 12:38:12.000000000 +0200
++++ libodbc++-0.2.3-20050404-dont-install-some-docs/doc/Makefile.am	2005-04-04 19:21:37.845039648 +0200
+@@ -37,21 +37,4 @@
+ dist-hook: all-local
+ 	cp -r $(srcdir)/$(instdoc_name) $(distdir)
+ 
+-install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(instdoc_dir) $(DESTDIR)$(instdoc_dir)/stylesheet-images
+-	for i in $(srcdir)/$(instdoc_name)/*; do \
+-		fn=`basename $$i` \
+-		$(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/$$fn; \
+-	done
+-	for i in $(srcdir)/$(instdoc_name)/stylesheet-images/*; do \
+-		fn=`basename $$i` \
+-		$(INSTALL_DATA) $$i $(DESTDIR)$(instdoc_dir)/stylesheet-images/$$fn; \
+-	done
+-
+-uninstall-local:
+-	if test -d $(DESTDIR)$(instdoc_dir); then \
+-		rm -rf $(DESTDIR)$(instdoc_dir)/*; \
+-		rmdir $(DESTDIR)$(instdoc_dir) || true; \
+-	fi
+-
+ EXTRA_DIST=$(instdoc_name).sgml

livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-namespace-closing-colon.patch

@@ -0,0 +1,130 @@
+diff -Naur libodbc++-0.2.3/include/odbc++/callablestatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h
+--- libodbc++-0.2.3/include/odbc++/callablestatement.h	2003-03-20 16:52:27.000000000 +0100
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/callablestatement.h	2005-01-18 14:47:32.761605624 +0100
+@@ -160,7 +160,7 @@
+   };
+ 
+   
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_CALLABLESTATEMENT_H
+diff -Naur libodbc++-0.2.3/include/odbc++/connection.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h
+--- libodbc++-0.2.3/include/odbc++/connection.h	2001-06-12 12:38:16.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/connection.h	2005-01-18 14:47:41.210321224 +0100
+@@ -204,7 +204,7 @@
+ 
+ 
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_CONNECTION_H
+diff -Naur libodbc++-0.2.3/include/odbc++/databasemetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h
+--- libodbc++-0.2.3/include/odbc++/databasemetadata.h	2001-06-12 12:38:17.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/databasemetadata.h	2005-01-18 14:47:44.922756848 +0100
+@@ -1333,7 +1333,7 @@
+   };
+ 
+   
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_DATABASEMETADATA_H
+diff -Naur libodbc++-0.2.3/include/odbc++/drivermanager.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h
+--- libodbc++-0.2.3/include/odbc++/drivermanager.h	2001-06-12 12:38:17.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/drivermanager.h	2005-01-18 14:47:48.704181984 +0100
+@@ -147,7 +147,7 @@
+ 
+ 
+ 
+-};
++}
+ 
+ 
+ #endif // __ODBCXX_DRIVERMANAGER_H
+diff -Naur libodbc++-0.2.3/include/odbc++/errorhandler.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h
+--- libodbc++-0.2.3/include/odbc++/errorhandler.h	2001-06-12 12:38:18.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/errorhandler.h	2005-01-18 14:47:53.838401464 +0100
+@@ -127,6 +127,6 @@
+   };
+ 
+   
+-}; // namespace odbc
++} // namespace odbc
+ 
+ #endif
+diff -Naur libodbc++-0.2.3/include/odbc++/preparedstatement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h
+--- libodbc++-0.2.3/include/odbc++/preparedstatement.h	2003-05-09 10:45:48.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/preparedstatement.h	2005-01-18 14:47:57.663819912 +0100
+@@ -211,6 +211,6 @@
+   };
+ 
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ #endif // __ODBCXX_PREPAREDSTATEMENT_H
+diff -Naur libodbc++-0.2.3/include/odbc++/resultset.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h
+--- libodbc++-0.2.3/include/odbc++/resultset.h	2001-06-12 12:38:19.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultset.h	2005-01-18 14:48:01.966165856 +0100
+@@ -619,7 +619,7 @@
+ 
+   
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_RESULTSET_H
+diff -Naur libodbc++-0.2.3/include/odbc++/resultsetmetadata.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h
+--- libodbc++-0.2.3/include/odbc++/resultsetmetadata.h	2001-06-12 12:38:20.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/resultsetmetadata.h	2005-01-18 14:48:05.372647992 +0100
+@@ -176,7 +176,7 @@
+ 
+   
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_RESULTSETMETADATA_H
+diff -Naur libodbc++-0.2.3/include/odbc++/statement.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h
+--- libodbc++-0.2.3/include/odbc++/statement.h	2003-03-20 16:52:32.000000000 +0100
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/statement.h	2005-01-18 14:48:11.589702856 +0100
+@@ -260,7 +260,7 @@
+   
+ 
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_STATEMENT_H
+diff -Naur libodbc++-0.2.3/include/odbc++/threads.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h
+--- libodbc++-0.2.3/include/odbc++/threads.h	2001-06-12 12:38:20.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/threads.h	2005-01-18 14:48:16.409970064 +0100
+@@ -65,7 +65,7 @@
+     }
+   };
+ 
+-}; //namespace odbc
++} //namespace odbc
+ 
+ // macro used all over the place
+ #define ODBCXX_LOCKER(mut) odbc::Locker _locker(mut)
+diff -Naur libodbc++-0.2.3/include/odbc++/types.h libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h
+--- libodbc++-0.2.3/include/odbc++/types.h	2003-06-17 12:08:02.000000000 +0200
++++ libodbc++-0.2.3-no-namespace-closing-colon/include/odbc++/types.h	2005-01-18 14:48:22.560035112 +0100
+@@ -791,7 +791,7 @@
+     }
+   };
+ 
+-}; // namespace odbc
++} // namespace odbc
+ 
+ 
+ #endif // __ODBCXX_TYPES_H

livesupport/tools/libodbc++/libodbc++-0.2.3-20050404/etc/libodbc++-no-thread-dmaccess-mutex-fix.patch

@@ -0,0 +1,14 @@
+diff -Naur libodbc++-0.2.3-20050404/src/drivermanager.cpp libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp
+--- libodbc++-0.2.3-20050404/src/drivermanager.cpp	2005-02-27 23:37:23.000000000 +0100
++++ libodbc++-0.2.3-20050404-no-thread-dmaccess-mutex-fix/src/drivermanager.cpp	2005-04-04 18:35:25.725465880 +0200
+@@ -87,8 +87,10 @@
+     }
+   }
+ 
++#ifdef ODBCXX_ENABLE_THREADS
+   // remove the mutex as we can't rely on static destructors
+   DMAccessMutex(1);
++#endif
+ }
+ 
+