From 508e025cea680cea1217cca8fd347b666b31dc7a Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Tue, 29 Dec 2015 12:54:01 -0500
Subject: [PATCH] Make sure the port numbers get changed a bit, and fix some
 complication issues in the new backend.

---
 src/server/WebBackend.cpp | 24 +++++++++++-------------
 src/server/WebSocket.h    |  2 ++
 src/server/main.cpp       |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/server/WebBackend.cpp b/src/server/WebBackend.cpp
index ea75cd0..a54c9c1 100644
--- a/src/server/WebBackend.cpp
+++ b/src/server/WebBackend.cpp
@@ -15,7 +15,7 @@
 #define DEBUG 0
 #define SCLISTDELIM QString("::::") //SysCache List Delimiter
 
-void WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJsonObject *out){
+RestOutputStruct::ExitCode WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJsonObject *out){
   //Go through and forward this request to the appropriate sub-system
   if(name.toLower()=="syscache"){
     return EvaluateSyscacheRequest(args, out);
@@ -27,16 +27,15 @@ void WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJso
 
 }
 
-RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue in_args, QJSonObject *out){
+RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue in_args, QJsonObject *out){
   //syscache only needs a list of sub-commands at the moment (might change later)
   QStringList in_req;
 
   //Parse the input arguments structure
-  if(args.isArray()){ in_req = JsonArrayToStringList(args.toArray()); }
-  else if(args.isObject()){
-    QStringList keys = arg.toObject().keys();
-    for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(args.toObject().value(keys[i])); }
-  }else if(args.isValue()){ in_req << JsonValueToString(args.toValue()); }
+  if(in_args.isArray()){ in_req = JsonArrayToStringList(in_args.toArray()); }
+  else if(in_args.isObject()){
+    QStringList keys = in_args.toObject().keys();
+    for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(in_args.toObject().value(keys[i])); }
   }else{ return RestOutputStruct::BADREQUEST; }
 
   //Run the Request (should be one value for each in_req)
@@ -60,16 +59,15 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue i
   return RestOutputStruct::OK;
 }
 
-RestOutputStruct::ExitCode WebSocket::EvaluateDispatcherRequest(const QJsonValue in_args, QJSonObject *out){
+RestOutputStruct::ExitCode WebSocket::EvaluateDispatcherRequest(const QJsonValue in_args, QJsonObject *out){
   //dispatcher only needs a list of sub-commands at the moment (might change later)
   QStringList in_req;
 
   //Parse the input arguments structure
-  if(args.isArray()){ in_req = JsonArrayToStringList(args.toArray()); }
-  else if(args.isObject()){
-    QStringList keys = arg.toObject().keys();
-    for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(args.toObject().value(keys[i])); }
-  }else if(args.isValue()){ in_req << JsonValueToString(args.toValue()); }
+  if(in_args.isArray()){ in_req = JsonArrayToStringList(in_args.toArray()); }
+  else if(in_args.isObject()){
+    QStringList keys = in_args.toObject().keys();
+    for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(in_args.toObject().value(keys[i])); }
   }else{ return RestOutputStruct::BADREQUEST; }
 
   //Run the Request (should be one value for each in_req)
diff --git a/src/server/WebSocket.h b/src/server/WebSocket.h
index f518820..7a377ad 100644
--- a/src/server/WebSocket.h
+++ b/src/server/WebSocket.h
@@ -48,7 +48,9 @@ private:
 	void SetOutputError(QJsonObject *ret, QString id, int err, QString msg);
 
 	//Backend request/reply functions (contained in WebBackend.cpp)
+	// -- Main subsystem parser
 	RestOutputStruct::ExitCode EvaluateBackendRequest(QString name, const QJsonValue in_args, QJsonObject *out);
+	// -- Individual subsystems
 	RestOutputStruct::ExitCode EvaluateSyscacheRequest(const QJsonValue in_args, QJsonObject *out);
 	RestOutputStruct::ExitCode EvaluateDispatcherRequest(const QJsonValue in_args, QJsonObject *out);
 
diff --git a/src/server/main.cpp b/src/server/main.cpp
index e4f327d..f6d0043 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -18,8 +18,8 @@
 #endif
 
 #define DEBUG 1
-#define WSPORTNUMBER 12142 	// WebSocket server default port
-#define PORTNUMBER 12142		// TCP server default port
+#define WSPORTNUMBER 12150 	// WebSocket server default port
+#define PORTNUMBER 12151		// TCP server default port
 
 QFile logfile;
 void MessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg){