[svn] commit: r1127 - /trunk/src/lib/auth/data_source_sqlite3.cc

[BIND 10 source code commits]

Author: jinmei
Date: Fri Mar  5 09:11:45 2010
New Revision: 1127

Log:
- don't try loading nsec tables yet (as tools are not publicly available)
- some other minor cleanups

Modified:
    trunk/src/lib/auth/data_source_sqlite3.cc

Modified: trunk/src/lib/auth/data_source_sqlite3.cc
==============================================================================
--- trunk/src/lib/auth/data_source_sqlite3.cc (original)
+++ trunk/src/lib/auth/data_source_sqlite3.cc Fri Mar  5 09:11:45 2010
@@ -13,6 +13,8 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 // $Id$
+
+#include <string>
 
 #include "data_source_sqlite3.h"
 
@@ -366,6 +368,7 @@
         throw(e);
     }
 
+#if 0                           // XXX
     const char* q_nsec3_str = "SELECT rdtype, ttl, rdata FROM nsec3 "
                               "WHERE zone_id=?1 AND hash == $2";
     try {
@@ -386,6 +389,7 @@
         cout << sqlite3_errmsg(db) << endl;
         throw(e);
     }
+#endif
 }
 
 void
@@ -440,8 +444,9 @@
     }
 }
 
-Sqlite3DataSrc::Sqlite3DataSrc() {
-    db = NULL;
+Sqlite3DataSrc::Sqlite3DataSrc() :
+    db(NULL)
+{
     database_version = -1;
     q_zone = NULL;
     q_record = NULL;
@@ -460,13 +465,8 @@
 
 DataSrc::Result
 Sqlite3DataSrc::init() {
-    try {
-        open("/tmp/zone.sqlite3");
-    
-        cout << "Schema version: " << getVersion() << endl;
-    } catch (const char* e) {
-        cout << e << endl;
-    }
+    open("/tmp/zone.sqlite3");
+    cerr << "Schema version: " << getVersion() << endl;
 
     return (SUCCESS);
 }