[cig-commits] r20610 - cs/spatialdata/trunk/libsrc/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2012-08-20 15:07:15 -0700 (Mon, 20 Aug 2012)
New Revision: 20610

Modified:
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleDB.cc
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.cc
   cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.hh
Log:
Fixed resetting of query type when closing database. Keep query object but deallocate query data.

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleDB.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleDB.cc	2012-08-20 17:40:52 UTC (rev 20609)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleDB.cc	2012-08-20 22:07:15 UTC (rev 20610)
@@ -86,7 +86,9 @@
 spatialdata::spatialdb::SimpleDB::close(void)
 { // close
   delete _data; _data = 0;
-  delete _query; _query = 0;
+
+  assert(_query);
+  _query->deallocate();
 } // close
 
 // ----------------------------------------------------------------------

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.cc
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.cc	2012-08-20 17:40:52 UTC (rev 20609)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.cc	2012-08-20 22:07:15 UTC (rev 20610)
@@ -51,9 +51,18 @@
 // Default destructor.
 spatialdata::spatialdb::SimpleDBQuery::~SimpleDBQuery(void)
 { // destructor
+  deallocate();
+} // destructor
+  
+// ----------------------------------------------------------------------
+// Deallocate data structures.
+void
+spatialdata::spatialdb::SimpleDBQuery::deallocate(void)
+{ // deallocate
   delete[] _queryVals; _queryVals = 0;
   _querySize = 0;
-} // destructor
+  _nearest.resize(0);
+} // deallocate
   
 // ----------------------------------------------------------------------
 // Set query type.

Modified: cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.hh
===================================================================
--- cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.hh	2012-08-20 17:40:52 UTC (rev 20609)
+++ cs/spatialdata/trunk/libsrc/spatialdb/SimpleDBQuery.hh	2012-08-20 22:07:15 UTC (rev 20610)
@@ -43,6 +43,9 @@
   /// Default destructor.
   ~SimpleDBQuery(void);
   
+  /// Dellocate data structures.
+  void deallocate(void);
+
   /** Set query type.
    *
    * @param Set type of query