From cb7a6a7af537efeb6589df75d511ccc138e0bf7a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Sun, 14 Sep 2014 09:43:55 -0700 Subject: [PATCH 1/4] don't blindly return all values if a type is not passed --- domain-server/src/DomainServerSettingsManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 9c741b2a3b..ae07374d95 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -22,7 +22,7 @@ #include "DomainServerSettingsManager.h" const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/web/settings/describe.json"; -const QString SETTINGS_CONFIG_FILE_RELATIVE_PATH = "/resources/config.json"; +const QString SETTINGS_CONFIG_FILE_RELATIVE_PATH = "/resources/settings.json"; DomainServerSettingsManager::DomainServerSettingsManager() : _descriptionObject(), @@ -61,7 +61,7 @@ bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connec if (typeValue.isEmpty()) { // combine the description object and our current settings map responseObject["descriptions"] = _descriptionObject; - responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); + // responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); } else { // convert the string type value to a QJsonValue QJsonValue queryType = QJsonValue(typeValue.toInt()); From 4d80417e3c5530d2881dfb27348e241e74fe186f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Sun, 14 Sep 2014 09:45:02 -0700 Subject: [PATCH 2/4] don't rename the config file to settings so existing nodes work --- domain-server/src/DomainServerSettingsManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index ae07374d95..9c741b2a3b 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -22,7 +22,7 @@ #include "DomainServerSettingsManager.h" const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/web/settings/describe.json"; -const QString SETTINGS_CONFIG_FILE_RELATIVE_PATH = "/resources/settings.json"; +const QString SETTINGS_CONFIG_FILE_RELATIVE_PATH = "/resources/config.json"; DomainServerSettingsManager::DomainServerSettingsManager() : _descriptionObject(), @@ -61,7 +61,7 @@ bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connec if (typeValue.isEmpty()) { // combine the description object and our current settings map responseObject["descriptions"] = _descriptionObject; - // responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); + responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); } else { // convert the string type value to a QJsonValue QJsonValue queryType = QJsonValue(typeValue.toInt()); From d6dca8469462cf600e0b1ffab434f0bfc89b3f10 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Sun, 14 Sep 2014 09:45:34 -0700 Subject: [PATCH 3/4] add back commenting out of blind values return --- domain-server/src/DomainServerSettingsManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 9c741b2a3b..00d15be648 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -61,7 +61,7 @@ bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connec if (typeValue.isEmpty()) { // combine the description object and our current settings map responseObject["descriptions"] = _descriptionObject; - responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); + // responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); } else { // convert the string type value to a QJsonValue QJsonValue queryType = QJsonValue(typeValue.toInt()); From c98b69f24fc486a8273e7f8641210b0931ec5656 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Sun, 14 Sep 2014 09:52:10 -0700 Subject: [PATCH 4/4] don't comment value return, rename domain settings file --- domain-server/src/DomainServerSettingsManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 00d15be648..6dff445fca 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -22,7 +22,7 @@ #include "DomainServerSettingsManager.h" const QString SETTINGS_DESCRIPTION_RELATIVE_PATH = "/resources/web/settings/describe.json"; -const QString SETTINGS_CONFIG_FILE_RELATIVE_PATH = "/resources/config.json"; +const QString SETTINGS_JSON_FILE_RELATIVE_PATH = "/resources/settings.json"; DomainServerSettingsManager::DomainServerSettingsManager() : _descriptionObject(), @@ -35,7 +35,7 @@ DomainServerSettingsManager::DomainServerSettingsManager() : _descriptionObject = QJsonDocument::fromJson(descriptionFile.readAll()).object(); // load the existing config file to get the current values - QFile configFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH); + QFile configFile(QCoreApplication::applicationDirPath() + SETTINGS_JSON_FILE_RELATIVE_PATH); if (configFile.exists()) { configFile.open(QIODevice::ReadOnly); @@ -61,7 +61,7 @@ bool DomainServerSettingsManager::handlePublicHTTPRequest(HTTPConnection* connec if (typeValue.isEmpty()) { // combine the description object and our current settings map responseObject["descriptions"] = _descriptionObject; - // responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); + responseObject["values"] = QJsonDocument::fromVariant(_settingsMap).object(); } else { // convert the string type value to a QJsonValue QJsonValue queryType = QJsonValue(typeValue.toInt()); @@ -197,7 +197,7 @@ QByteArray DomainServerSettingsManager::getJSONSettingsMap() const { } void DomainServerSettingsManager::persistToFile() { - QFile settingsFile(QCoreApplication::applicationDirPath() + SETTINGS_CONFIG_FILE_RELATIVE_PATH); + QFile settingsFile(QCoreApplication::applicationDirPath() + SETTINGS_JSON_FILE_RELATIVE_PATH); if (settingsFile.open(QIODevice::WriteOnly)) { settingsFile.write(getJSONSettingsMap());