From 87ab5f2a221717825b14ddd999100767997ea5ad Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Mon, 4 Jan 2016 13:01:39 -0500
Subject: [PATCH] Fix the input argument parsing for sysadm-server.

---
 src/server/RestStructs.h | 3 ++-
 src/server/WebSocket.cpp | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/server/RestStructs.h b/src/server/RestStructs.h
index 7f25df9..f029d58 100644
--- a/src/server/RestStructs.h
+++ b/src/server/RestStructs.h
@@ -38,6 +38,7 @@ public:
 	  HTTPVERSION = CurHttpVersion; //default value
 	  if(message.isEmpty()){ return; }
 	  //Pull out any REST headers
+	  Body = message;
 	  if(!message.startsWith("{")){ 
 	    Header = message.section("\n{",0,0).split("\n");
 	  }
@@ -56,7 +57,7 @@ public:
 	      //Valid JSON found
 	      if(doc.object().contains("namespace") ){ namesp = doc.object().value("namespace").toString(); }
 	      if(doc.object().contains("name") ){ name = doc.object().value("name").toString(); }
-	      if(doc.object().contains("id") ){ namesp = doc.object().value("id").toString(); }
+	      if(doc.object().contains("id") ){ id = doc.object().value("id").toString(); }
 	      if(doc.object().contains("args") ){ args = doc.object().value("args"); }
 	      else{
 	        //no args structure - treat the entire body as the arguments struct
diff --git a/src/server/WebSocket.cpp b/src/server/WebSocket.cpp
index bc61abd..b1c1591 100644
--- a/src/server/WebSocket.cpp
+++ b/src/server/WebSocket.cpp
@@ -75,6 +75,11 @@ void WebSocket::EvaluateREST(QString msg){
     qDebug() << "  VERB:" << IN.VERB << "URI:" << IN.URI;
     qDebug() << "  HEADERS:" << IN.Header;
     qDebug() << "  BODY:" << IN.Body;
+    qDebug() << "JSON Values:";
+    qDebug() << " - Name:" << IN.name;
+    qDebug() << " - Namespace:" << IN.namesp;
+    qDebug() << " - ID:" << IN.id;
+    qDebug() << " - Has Args:" << IN.args.isNull();
   }
   //Now check for the REST-specific verbs/actions
   if(IN.VERB == "OPTIONS" || IN.VERB == "HEAD"){