--- projects/cms/source/host/c++/XMLFormatter.cpp	2001/02/26 14:54:13	1.4
+++ projects/cms/source/host/c++/XMLFormatter.cpp	2001/03/23 14:07:11	1.5
@@ -12,10 +12,10 @@ XMLFormatter::XMLFormatter( string newHostInfo ){
 	stackPointer = 0;
 }
 
-XMLFormatter::XMLFormatter( ){
+XMLFormatter::XMLFormatter(){
 	// std::cout << "DEBUG: " << "No Root info" << "\n";
 	hostInfo = ""; // null
-	xmlData = hostInfo;
+	xmlData = "";
 	stackPointer = 0;
 }
 
@@ -34,10 +34,13 @@ XMLFormatter::XMLFormatter( string newHostInfo, string
 
 void XMLFormatter::closeNest(){
 	// std::cout << "DEBUG: Closing Nest: " << stackPointer << ":" << stack[stackPointer] << "\n";
-	stackPointer--;
-	xmlData += "</";
-	xmlData += stack[stackPointer];
-	xmlData += ">";
+	if ( stackPointer >= 0 ){
+    	
+    	stackPointer--;
+    	xmlData += "</";
+    	xmlData += stack[stackPointer];
+    	xmlData += ">";
+	}
 	
 	return;	
 }
@@ -61,11 +64,13 @@ void XMLFormatter::addElement(string element, string a
 	xmlData += " ";
 	xmlData += attributes;
 	xmlData += ">";
-	xmlData += value;
-	xmlData += "</";
-	xmlData += element;
-	xmlData += ">";
-	return;
+	if ( value != "" ){
+    	xmlData += value;
+    	xmlData += "</";
+    	xmlData += element;
+    	xmlData += ">";
+    } // if
+    return;
 }
 
 void XMLFormatter::addElement(string element, string value){
@@ -89,11 +94,13 @@ string XMLFormatter::returnXML(){
 		closeNest();	
 	}
 	
-	if ( hostInfo.length() != 0 ){
-		xmlData += "</";
+	if ( hostInfo.length() > 0 ){
+	    xmlData += "</";
 		xmlData += hostInfo;
 		xmlData += ">";
 	}
+	
+	stackPointer = 0;
 	
 	// std::cout << "DEBUG: returning XML: " << xmlData;
 	return xmlData;