[svn] commit: r2852 - in /branches/trac232: ./ src/lib/datasrc/ src/lib/datasrc/python/ src/lib/datasrc/python/tests/

[BIND 10 source code commits]

Author: jelte
Date: Tue Sep  7 12:43:25 2010
New Revision: 2852

Log:
start with datasrc python access

Added:
    branches/trac232/src/lib/datasrc/python/
    branches/trac232/src/lib/datasrc/python/Makefile.am
    branches/trac232/src/lib/datasrc/python/libdata_source_python.cc
    branches/trac232/src/lib/datasrc/python/tests/
    branches/trac232/src/lib/datasrc/python/tests/Makefile.am
    branches/trac232/src/lib/datasrc/python/tests/data_source_python_test.py
Modified:
    branches/trac232/configure.ac
    branches/trac232/src/lib/datasrc/Makefile.am
    branches/trac232/src/lib/datasrc/data_source.cc
    branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc

Modified: branches/trac232/configure.ac
==============================================================================
--- branches/trac232/configure.ac (original)
+++ branches/trac232/configure.ac Tue Sep  7 12:43:25 2010
@@ -458,6 +458,8 @@
                  src/lib/exceptions/tests/Makefile
                  src/lib/datasrc/Makefile
                  src/lib/datasrc/tests/Makefile
+                 src/lib/datasrc/python/Makefile
+                 src/lib/datasrc/python/tests/Makefile
                  src/lib/xfr/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py

Modified: branches/trac232/src/lib/datasrc/Makefile.am
==============================================================================
--- branches/trac232/src/lib/datasrc/Makefile.am (original)
+++ branches/trac232/src/lib/datasrc/Makefile.am Tue Sep  7 12:43:25 2010
@@ -1,4 +1,4 @@
-SUBDIRS = . tests
+SUBDIRS = . tests python
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns

Modified: branches/trac232/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.cc (original)
+++ branches/trac232/src/lib/datasrc/data_source.cc Tue Sep  7 12:43:25 2010
@@ -1655,7 +1655,6 @@
 DataSrc::TransactionResult
 MetaDataSrc::startTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
 {
-    
     return (T_NOT_IMPLEMENTED);
 }
 

Modified: branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc (original)
+++ branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc Tue Sep  7 12:43:25 2010
@@ -713,8 +713,9 @@
 
     Sqlite3Initializer initializer;
 
-    if (sqlite3_open(name.c_str(), &initializer.params_.db_) != 0) {
-        isc_throw(Sqlite3Error, "Cannot open SQLite database file: " << name);
+    int sq_result = sqlite3_open(name.c_str(), &initializer.params_.db_);
+    if (sq_result != 0) {
+        isc_throw(Sqlite3Error, "Cannot open SQLite database file " << name << ": error " << sq_result << " (" << sqlite3_errmsg(dbparameters->db_) << ")");
     }
 
     checkAndSetupSchema(&initializer);
@@ -817,7 +818,7 @@
 }
 
 DataSrc::TransactionResult
-Sqlite3DataSrc::rollbackTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
+Sqlite3DataSrc::rollbackTransaction(DataSrcTransaction& transaction)
 {
     if (transaction.getState() != DataSrcTransaction::RUNNING) {
         return DataSrc::T_ERROR;