httpd: some code cleanup for JsonUriHandler.

no functional change

diff --git a/src/Network/http/JsonUriHandler.cxx b/src/Network/http/JsonUriHandler.cxx
index d2ac6a7db0804fa6fcb53bedb74b86e3de022386..6b0187ba14ab0aa2c778ddf5c071892e0ff1cbf2 100644 (file)
--- a/src/Network/http/JsonUriHandler.cxx
+++ b/src/Network/http/JsonUriHandler.cxx
@@ -22,7 +22,6 @@
 #include "JsonUriHandler.hxx"
 #include "jsonprops.hxx"
 #include <Main/fg_props.hxx>
-#include <simgear/props/props.hxx>
 
 using std::string;
 
@@ -41,20 +40,6 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
   }
 
   if( request.Method == "GET" ){
-    string propertyPath = request.Uri;
-
-    // strip the uri prefix of our handler
-    propertyPath = propertyPath.substr( getUri().size() );
-
-    // strip the querystring
-    size_t pos = propertyPath.find( '?' );
-    if( pos != string::npos ) {
-      propertyPath = propertyPath.substr( 0, pos-1 );
-    }
-
-    // skip trailing '/' - not very efficient but shouldn't happen too often
-    while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
-      propertyPath = propertyPath.substr(0,propertyPath.length()-1);
 
     // max recursion depth
     int  depth = atoi(request.RequestVariables.get("d").c_str());
@@ -64,13 +49,11 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
     bool indent = request.RequestVariables.get("i") == "y";
     bool timestamp = request.RequestVariables.get("t") == "y";
 
-    SGPropertyNode_ptr node = fgGetNode( string("/") + propertyPath );
+    SGPropertyNode_ptr node = getRequestedNode(request );
     if( false == node.valid() ) {
       response.StatusCode = 404;
       response.Content = "{}";
-      SG_LOG(SG_NETWORK,SG_WARN, "Node not found: '" << propertyPath << "'");
       return true;
-
     } 
 
     response.Content = JSON::toJsonString( indent, node, depth, timestamp ? fgGetDouble("/sim/time/elapsed-sec") : -1.0 );
@@ -79,28 +62,14 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
   }
 
   if( request.Method == "POST" ) {
-    SG_LOG(SG_NETWORK,SG_INFO, "Setting properties from JSON: " << request.Content );
-    string propertyPath = request.Uri;
-    propertyPath = propertyPath.substr( getUri().size() );
-
-    // strip the querystring
-    size_t pos = propertyPath.find( '?' );
-    if( pos != string::npos ) {
-      propertyPath = propertyPath.substr( 0, pos-1 );
-    }
-
-    // skip trailing '/' - not very efficient but shouldn't happen too often
-    while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
-      propertyPath = propertyPath.substr(0,propertyPath.length()-1);
-
-    SGPropertyNode_ptr node = fgGetNode( string("/") + propertyPath );
+    SGPropertyNode_ptr node = getRequestedNode(request );
     if( false == node.valid() ) {
       response.StatusCode = 404;
       response.Content = "{}";
-      SG_LOG(SG_NETWORK,SG_WARN, "Node not found: '" << propertyPath << "'");
       return true;
     } 
 
+    SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: setting property from'" << request.Content << "'" );
     cJSON * json = cJSON_Parse( request.Content.c_str() );
     if( NULL != json ) {
       JSON::toProp( json, node );
@@ -111,13 +80,32 @@ bool JsonUriHandler::handleRequest( const HTTPRequest & request, HTTPResponse &
     return true;
   }
 
-  response.Header["Allow"] = "OPTIONS, GET";
+  SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: invalid request method '" << request.Method << "'" );
+  response.Header["Allow"] = "OPTIONS, GET, POST";
   response.StatusCode = 405;
   response.Content = "{}";
   return true; 
 
 }
 
+SGPropertyNode_ptr JsonUriHandler::getRequestedNode(const HTTPRequest & request)
+{
+  SG_LOG(SG_NETWORK,SG_INFO, "JsonUriHandler: request is '" << request.Uri << "'" );
+  string propertyPath = request.Uri;
+  propertyPath = propertyPath.substr( getUri().size() );
+
+  // skip trailing '/' - not very efficient but shouldn't happen too often
+  while( false == propertyPath.empty() && propertyPath[ propertyPath.length()-1 ] == '/' )
+    propertyPath = propertyPath.substr(0,propertyPath.length()-1);
+
+  SGPropertyNode_ptr reply = fgGetNode( string("/") + propertyPath );
+  if( false == reply.valid() ) {
+    SG_LOG(SG_NETWORK,SG_WARN, "JsonUriHandler: requested node not found: '" << propertyPath << "'");
+  }
+  return reply;
+}
+
+
 } // namespace http
 } // namespace flightgear
 

diff --git a/src/Network/http/JsonUriHandler.hxx b/src/Network/http/JsonUriHandler.hxx
index a0c672f91ec7bf75826e7bd22e6ec6111db1bf33..c7922755ba1ac68ca5feac26207880c957ac6897 100644 (file)
--- a/src/Network/http/JsonUriHandler.hxx
+++ b/src/Network/http/JsonUriHandler.hxx
@@ -22,6 +22,7 @@
 #define __FG_JSON_URI_HANDLER_HXX
 
 #include "urihandler.hxx"
+#include <simgear/props/props.hxx>
 
 namespace flightgear {
 namespace http {
@@ -30,6 +31,8 @@ class JsonUriHandler : public URIHandler {
 public:
   JsonUriHandler( const char * uri = "/json/" ) : URIHandler( uri  ) {}
   virtual bool handleRequest( const HTTPRequest & request, HTTPResponse & response, Connection * connection );
+private:
+  SGPropertyNode_ptr getRequestedNode(const HTTPRequest & request);
 };
 
 } // namespace http