fix bad DB initialization

wg-perception · May 11, 2012 · d1bf40f · d1bf40f
1 parent e8650ad
commit d1bf40f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/include/object_recognition_core/db/db_parameters.h b/include/object_recognition_core/db/db_parameters.h
@@ -36,6 +36,8 @@
 #ifndef DB_PARAMETERS_H_
 #define DB_PARAMETERS_H_
 
+#include <object_recognition_core/common/json.hpp>
+
 namespace object_recognition_core
 {
   namespace db
@@ -68,37 +70,47 @@ namespace object_recognition_core
        * @param params A map between some db parameters and their value
        */
       explicit
-      ObjectDbParameters(const or_json::mObject& params);
+      ObjectDbParameters(const ObjectDbParametersRaw& params);
 
       static ObjectDbType
       StringToType(const std::string & type);
 
       static std::string
       TypeToString(const ObjectDbParameters::ObjectDbType & type);
 
-      ObjectDbType
+      inline ObjectDbType
       type() const
       {
         return type_;
       }
 
       template<typename T>
       void
-      set_parameter(const std::string & key, const T & value)
+      set_parameter(const std::string& key, const T& value)
       {
         if (key == "type")
           set_type(value);
         else
+        {
+          if ((type() != NONCORE) && (raw_.find(key) == raw_.end()))
+            throw std::runtime_error("Key \"" + key + "\" not a default key in db of type " + TypeToString(type()));
+
           raw_[key] = or_json::mValue(value);
+        }
       }
 
       void
-      set_parameter(const std::string & key, const or_json::mValue & value)
+      set_parameter(const std::string& key, const or_json::mValue& value)
       {
         if (key == "type")
           set_type(value.get_str());
         else
+        {
+          if ((type() != NONCORE) && (raw_.find(key) == raw_.end()))
+            throw std::runtime_error("Key \"" + key + "\" not a default key in db of type " + TypeToString(type()));
+
           raw_[key] = value;
+        }
       }
 
       void
@@ -131,10 +143,11 @@ namespace object_recognition_core
     protected:
       /** The type of the collection 'CouchDB' ... */
       ObjectDbType type_;
-      /** All the raw parameters: they are of integral types */
+      /** All the raw parameters: they are of integral types. 'type' is there */
       or_json::mObject raw_;
     };
   }
 }
 
 #endif /* DB_PARAMETERS_H_ */
+
diff --git a/src/db/db.cpp b/src/db/db.cpp
@@ -102,7 +102,7 @@ namespace object_recognition_core
       }
     }
 
-    ObjectDbParameters::ObjectDbParameters(const or_json::mObject& parameters)
+    ObjectDbParameters::ObjectDbParameters(const ObjectDbParametersRaw& parameters)
     {
       if (parameters.find("type") == parameters.end())
       {
@@ -157,23 +157,25 @@ namespace object_recognition_core
     }
 
     void
-    ObjectDb::set_parameters(const ObjectDbParameters &in_params)
+    ObjectDb::set_parameters(const ObjectDbParameters& in_params)
     {
-      ObjectDbParametersRaw params_raw = parameters_.raw();
+      ObjectDbParametersRaw params_raw = in_params.raw();
-      switch (parameters_.type())
+
+      switch (in_params.type())
       {
         case ObjectDbParameters::COUCHDB:
           db_ = boost::shared_ptr<ObjectDbBase>(new ObjectDbCouch(params_raw));
-          return;
+          break;
         case ObjectDbParameters::EMPTY:
-          return;
+          break;
         case ObjectDbParameters::FILESYSTEM:
           db_ = boost::shared_ptr<ObjectDbBase>(new ObjectDbFilesystem(params_raw));
-          return;
+          break;
         default:
-          return;
+          break;
       }
-      parameters_ = in_params;
+
+      parameters_ = ObjectDbParameters(params_raw);
     }
 
     void