All changes up to my dissertation

1 files changed, 22 insertions, 11 deletions

diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
index cf7c8e7..19d109a 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
@@ -123,21 +123,22 @@ bool BasicHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
 	 * raises.
 	 */
 
-	// this will call the const subscript operator
-//	if (req.data.at("content").hasKey("_scxmleventname")) {
-//		reqEvent.name = req.data.at("content").at("_scxmleventname").atom;
-//	}
-//	if (req.data.at("content").hasKey("content")) {
-//		reqEvent.content = req.data.at("content").at("content").atom;
-//	}
-
+    { // if we sent ourself an event it will end up here
+        // this will call the const subscript operator
+        if (req.data.at("content").hasKey("_scxmleventname")) {
+            reqEvent.name = req.data.at("content").at("_scxmleventname").atom;
+        }
+        if (req.data.at("content").hasKey("content")) {
+            reqEvent.content = req.data.at("content").at("content").atom;
+        }
+    }
+    
+    // if we used wget, it will end up here - unify?
 	if (req.data.hasKey("content")) {
 		const Data& data = req.data["content"];
 		for(std::map<std::string, Data>::const_iterator compIter = data.compound.begin();
 		        compIter!= data.compound.end(); compIter++) {
-			if (compIter->first == "_scxmleventname") {
-				reqEvent.name = compIter->second.atom;
-			} else if (compIter->first == "content") {
+			if (compIter->first == "content") {
 				reqEvent.content = compIter->second.atom;
 			} else {
 				reqEvent.data[compIter->first] = compIter->second;
@@ -145,6 +146,16 @@ bool BasicHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
 		}
 	}
 
+    if (req.data.hasKey("header")) {
+        const Data& data = req.data["header"];
+        for(std::map<std::string, Data>::const_iterator compIter = data.compound.begin();
+            compIter!= data.compound.end(); compIter++) {
+            if (compIter->first == "_scxmleventname") {
+                reqEvent.name = compIter->second.atom;
+            }
+        }
+    }
+    
 	// check whether we can parse it as XML
 	if (reqEvent.content.length() > 0) {
 		NameSpacingParser parser = NameSpacingParser::fromXML(reqEvent.content);