3 files changed, 16 insertions, 16 deletions

diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp
index d21b633..c29c2ec 100644
--- a/src/uscxml/Interpreter.cpp
+++ b/src/uscxml/Interpreter.cpp
@@ -170,13 +170,13 @@ Interpreter Interpreter::fromURL(const std::string& url) {
 	}
 
 	catch (const XERCESC_NS::SAXParseException& toCatch) {
-		LOGD(USCXML_ERROR) << X(toCatch.getMessage()) << std::endl;
+		ERROR_PLATFORM_THROW(X(toCatch.getMessage()));
 	} catch (const XERCESC_NS::RuntimeException& toCatch) {
-		LOGD(USCXML_ERROR) << X(toCatch.getMessage()) << std::endl;
+		ERROR_PLATFORM_THROW(X(toCatch.getMessage()));
 	} catch (const XERCESC_NS::XMLException& toCatch) {
-		LOGD(USCXML_ERROR) << X(toCatch.getMessage()) << std::endl;
+		ERROR_PLATFORM_THROW(X(toCatch.getMessage()));
 	} catch (const XERCESC_NS::DOMException& toCatch) {
-		LOGD(USCXML_ERROR) << X(toCatch.getMessage()) << std::endl;
+		ERROR_PLATFORM_THROW(X(toCatch.getMessage()));
 	}
 
 	return interpreter;
diff --git a/src/uscxml/messages/Data.cpp b/src/uscxml/messages/Data.cpp
index 51e1191..8cd6c20 100644
--- a/src/uscxml/messages/Data.cpp
+++ b/src/uscxml/messages/Data.cpp
@@ -216,7 +216,7 @@ std::string Data::asJSON() const {
 std::string Data::toJSON(const Data& data) {
 	std::stringstream os;
 	std::string indent;
-	for (size_t i = 0; i < _dataIndentation; i++) {
+	for (size_t i = 0; i <= _dataIndentation; i++) {
 		indent += "  ";
 	}
 	if (false) {
@@ -233,7 +233,7 @@ std::string Data::toJSON(const Data& data) {
 			keyPadding += " ";
 
 		std::string seperator;
-		os << std::endl << indent << "{";
+		os << "{";
 		compoundIter = data.compound.begin();
 		while(compoundIter != data.compound.end()) {
 			os << seperator << std::endl << indent << "  \"" << jsonEscape(compoundIter->first) << "\": " << keyPadding.substr(0, longestKey - compoundIter->first.size());
diff --git a/src/uscxml/messages/Event.cpp b/src/uscxml/messages/Event.cpp
index f657ddb..5b933dc 100644
--- a/src/uscxml/messages/Event.cpp
+++ b/src/uscxml/messages/Event.cpp
@@ -89,19 +89,19 @@ std::ostream& operator<< (std::ostream& os, const Event& event) {
 	   << (event.eventType == Event::PLATFORM ? "Platform" : "") << " Event " << std::endl;
 
 	if (event.name.size() > 0)
-		os << indent << "  name: " << event.name << std::endl;
+		os << indent << "  \"name\": " << event.name << std::endl;
 	if (event.origin.size() > 0)
-		os << indent << "  origin: " << event.origin << std::endl;
+		os << indent << "  \"origin\": " << event.origin << std::endl;
 	if (event.origintype.size() > 0)
-		os << indent << "  origintype: " << event.origintype << std::endl;
+		os << indent << "  \"origintype\": " << event.origintype << std::endl;
 //    if (event.content.size() > 0)
 //        os << indent << "  content: '" << event.content << "'" << std::endl;
 	if (event.params.size() > 0) {
 		std::multimap<std::string, Data>::const_iterator paramIter = event.params.begin();
-		os << indent << "  params:" << std::endl;
+		os << indent << "  \"params\":" << std::endl;
 		_dataIndentation++;
 		while(paramIter != event.params.end()) {
-			os << indent << "    " << paramIter->first << ": ";
+			os << indent << "    \"" << paramIter->first << "\": ";
 			os << indent << paramIter->second << std::endl;
 			paramIter++;
 		}
@@ -109,19 +109,19 @@ std::ostream& operator<< (std::ostream& os, const Event& event) {
 	}
 	if (event.namelist.size() > 0) {
 		std::map<std::string, Data>::const_iterator namelistIter = event.namelist.begin();
-		os << indent << "  namelist:" << std::endl;
+		os << indent << "  \"namelist\":" << std::endl;
 		_dataIndentation++;
 		while(namelistIter != event.namelist.end()) {
-			os << indent << "    " << namelistIter->first << ": ";
+			os << indent << "    \"" << namelistIter->first << "\": ";
 			os << indent << namelistIter->second << std::endl;
 			namelistIter++;
 		}
 		_dataIndentation--;
 
 	}
-	_dataIndentation++;
-	os << indent << "  data: " << event.data << std::endl;
-	_dataIndentation--;
+	_dataIndentation += 2;
+	os << indent << "  \"data\": " << event.data;
+	_dataIndentation -= 2;
 	return os;
 }