fixed up database get ranged issues

diff --git a/examples/databaseconfig b/examples/databaseconfig
index ceee3d2..f2430e0 100644 (file)
--- a/examples/databaseconfig
+++ b/examples/databaseconfig
@@ -9,8 +9,9 @@
                {
                        "name" : "Database",
                        "path" : "/usr/lib/automotive-message-broker/databasesinkplugin.so",
-                       "properties" : "{ 'properties' : ['VehicleSpeed'] }",
-                       "startOnLoad" : "true"
+                       "properties" : "{ 'properties' : ['VehicleSpeed','EngineSpeed'] }",
+                       "startOnLoad" : "true",
+                       "bufferLength" : "1"
                },
                {
                        "name" : "Example Sink",

diff --git a/examples/storage b/examples/storage
index 65bd8a3..171b84a 100644 (file)
Binary files a/examples/storage and b/examples/storage differ

diff --git a/plugins/database/databasesink.cpp b/plugins/database/databasesink.cpp
index 5c5291c..93195b3 100644 (file)
--- a/plugins/database/databasesink.cpp
+++ b/plugins/database/databasesink.cpp
@@ -2,6 +2,8 @@
 #include "abstractroutingengine.h"
 #include "listplusplus.h"
 
+int bufferLength = 100;
+
 extern "C" AbstractSinkManager * create(AbstractRoutingEngine* routingengine, map<string, string> config)
 {
        return new DatabaseSinkManager(routingengine, config);
@@ -44,7 +46,7 @@ void * cbFunc(gpointer data)
 
                insertList.push_back(dict);
 
-               if(insertList.size() > 100)
+               if(insertList.size() > bufferLength)
                {
                        shared->db->exec("BEGIN IMMEDIATE TRANSACTION");
                        for(int i=0; i< insertList.size(); i++)
@@ -129,6 +131,11 @@ DatabaseSink::DatabaseSink(AbstractRoutingEngine *engine, map<std::string, std::
                setDatabaseFileName(config["databaseFile"]);
        }
 
+       if(config.find("bufferLength") != config.end())
+       {
+               bufferLength = atoi(config["bufferLength"].c_str());
+       }
+
        if(config.find("properties") != config.end())
        {
                parseConfig();
@@ -364,6 +371,12 @@ void DatabaseSink::propertyChanged(VehicleProperty::Property property, AbstractP
        if(!shared)
                return;
 
+       if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(property))
+       {
+               mSupported.push_back(property);
+               routingEngine->setSupported(mSupported, this);
+       }
+
        DBObject* obj = new DBObject;
        obj->key = property;
        obj->value = value->toString();
@@ -426,7 +439,7 @@ void DatabaseSink::getRangePropertyAsync(AsyncRangePropertyReply *reply)
        ostringstream query;
        query.precision(15);
 
-       query<<"SELECT * from "<<tablename<<" WHERE ";
+       query<<"SELECT * from "<<tablename<<" WHERE key='"<<reply->property<<"' AND";
 
        if(reply->timeBegin && reply->timeEnd)
        {

diff --git a/plugins/examplesink.cpp b/plugins/examplesink.cpp
index 333fa67..51e3535 100644 (file)
--- a/plugins/examplesink.cpp
+++ b/plugins/examplesink.cpp
@@ -158,7 +158,7 @@ void ExampleSink::supportedChanged(PropertyList supportedProperties)
                        for(auto itr = values.begin(); itr != values.end(); itr++)
                        {
                                auto val = *itr;
-                               DebugOut(1)<<"Velocity value from past: "<<val->toString()<<" time: "<<val->timestamp<<endl;
+                               DebugOut(1)<<"Value from past: ("<<val->name<<"): "<<val->toString()<<" time: "<<val->timestamp<<endl;
                        }
 
                        delete reply;