diff options
| author | Kevron Rees <kevron.m.rees@intel.com> | 2015-01-14 16:28:25 -0800 |
|---|---|---|
| committer | Kevron Rees <kevron.m.rees@intel.com> | 2015-01-14 16:28:33 -0800 |
| commit | 8568f4d93f6c4e196d851b6b17e2957b5d26b64c (patch) | |
| tree | 2b1c8aa286d80eb5ed31ecf32ed15f762ca3391f | |
| parent | 57e127da8971d48381c6068c197fa7c6512b631a (diff) | |
| download | automotive-message-broker-8568f4d93f6c4e196d851b6b17e2957b5d26b64c.tar.gz | |
additional merge fixes from last merge
| -rw-r--r-- | plugins/database/databasesink.cpp | 6 | ||||
| -rw-r--r-- | plugins/database/databasesink.h | 2 | ||||
| -rw-r--r-- | tools/ambctl.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/database/databasesink.cpp b/plugins/database/databasesink.cpp index 6976dc27..5a933ef0 100644 --- a/plugins/database/databasesink.cpp +++ b/plugins/database/databasesink.cpp @@ -342,7 +342,7 @@ void DatabaseSink::initDb() shared->db->init(databaseName->value<std::string>(), tablename, tablecreate); } -void DatabaseSink::setDatabaseFileName(string filename) +void DatabaseSink::updateForNewDbFilename() { bool wasLogging = databaseLogging->value<bool>(); @@ -414,7 +414,7 @@ void DatabaseSink::init() if(configuration.find("databaseFile") != configuration.end()) { setValue(databaseName, configuration["databaseFile"]); - setDatabaseFileName(); + updateForNewDbFilename(); } DebugOut() << "databaseLogging: " << databaseLogging->value<bool>() << endl; @@ -519,7 +519,7 @@ AsyncPropertyReply *DatabaseSink::setProperty(const AsyncSetPropertyRequest &req } else if(request.property == DatabaseFile) { - setDatabaseFileName(databaseName->value<std::string>()); + updateForNewDbFilename(); } else if( request.property == DatabasePlayback) { diff --git a/plugins/database/databasesink.h b/plugins/database/databasesink.h index e2589f7f..3b7efdbf 100644 --- a/plugins/database/databasesink.h +++ b/plugins/database/databasesink.h @@ -163,7 +163,7 @@ private: //methods: void startDb(); void startPlayback(); void initDb(); - void setDatabaseFileName(); + void updateForNewDbFilename(); private: PropertyList mSubscriptions; diff --git a/tools/ambctl.py b/tools/ambctl.py index 1552c647..fa4260ae 100644 --- a/tools/ambctl.py +++ b/tools/ambctl.py @@ -494,7 +494,7 @@ if args.command == "stdin": print row redraw(data) - elif curses.ascii.isalnum(ord(str)) or ord(str) == curses.ascii.SP: #regular text + elif curses.ascii.isprint(ord(str)) or ord(str) == curses.ascii.SP: #regular text data.insert(str) redraw(data) |