Updated tests for IRP and work on bindings

1 files changed, 20 insertions, 6 deletions

diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
index 7d9fcb8..b6dadc9 100644
--- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
+++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.cpp
@@ -124,13 +124,27 @@ bool BasicHTTPIOProcessor::httpRecvRequest(const HTTPServer::Request& req) {
 	 */
 
 	// 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 (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 (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") {
+				reqEvent.content = compIter->second.atom;
+			} else {
+				reqEvent.data[compIter->first] = compIter->second;
+			}
+		}
 	}
-
+	
 	// check whether we can parse it as XML
 	if (reqEvent.content.length() > 0) {
 		NameSpacingParser parser = NameSpacingParser::fromXML(reqEvent.content);