--- parser3/src/classes/xdoc.C	2003/09/22 07:05:52	1.112
+++ parser3/src/classes/xdoc.C	2003/11/06 08:22:48	1.115
@@ -9,7 +9,7 @@
 
 #ifdef XML
 
-static const char* IDENT_XDOC_C="$Date: 2003/09/22 07:05:52 $";
+static const char* IDENT_XDOC_C="$Date: 2003/11/06 08:22:48 $";
 
 #include "gdome.h"
 #include "libxml/tree.h"
@@ -26,6 +26,7 @@ static const char* IDENT_XDOC_C="$Date:
 #include "pa_vxdoc.h"
 #include "pa_charset.h"
 #include "pa_vfile.h"
+#include "pa_xml_exception.h"
 #include "xnode.h"
 
 // defines
@@ -160,7 +161,7 @@ private:
 static void writeNode(Request& r, GdomeNode *node, 
 					  GdomeException exc) {
 	if(!node || exc)
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 
 	// write out result
 	r.write_no_lang(*new VXnode(&r.charsets, node));
@@ -180,19 +181,19 @@ static void _createElement(Request& r, M
 	writeNode(r, node, exc);
 }
 
-// Element createElementNS(in DOMString localName) raises(DOMException);
+// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 static void _createElementNS(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	// namespaceURI;localName
 	const String& namespaceURI=params.as_string(0, "namespaceURI must be string");
-	const String& localName=params.as_string(1, "localName must be string");
+	const String& qualifiedName=params.as_string(1, "qualifiedName must be string");
 
 	GdomeException exc;
 	GdomeNode *node=
 		(GdomeNode *)gdome_doc_createElementNS(vdoc.get_document(), 
 		r.transcode(namespaceURI).use(),
-		r.transcode(localName).use(),
+		r.transcode(qualifiedName).use(),
 		&exc);
 	writeNode(r, node, exc);
 }
@@ -281,7 +282,7 @@ static void _createAttribute(Request& r,
 	writeNode(r, node, exc);
 }
 
-// Attr createAttributeNS(in DOMString name) raises(DOMException);
+// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 static void _createAttributeNS(Request& r, MethodParams& params) {
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
@@ -328,7 +329,7 @@ static void _getElementsByTagName(Reques
 		gulong length=gdome_nl_length(nodes, &exc);
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
 		throw Exception(0, exc);
@@ -355,7 +356,7 @@ static void _getElementsByTagNameNS(Requ
 		gulong length=gdome_nl_length(nodes, &exc);
 		for(gulong i=0; i<length; i++)
 			result.hash().put(
-				StringBody::Format(i), 
+				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	}
 
@@ -518,13 +519,13 @@ static void _load(Request& r, MethodPara
 static void param_option_over_output_option(
 					    HashStringValue& param_options, const char* option_name,
 					    const String*& output_option) {
-	if(Value* value=param_options.get(StringBody(option_name)))
+	if(Value* value=param_options.get(String::Body(option_name)))
 		output_option=&value->as_string();
 }
 static void param_option_over_output_option(
 					    HashStringValue& param_options, const char* option_name,
 					    bool& output_option) {
-	if(Value* value=param_options.get(StringBody(option_name))) {
+	if(Value* value=param_options.get(String::Body(option_name))) {
 		const String& s=value->as_string();
 		if(s=="yes")
 			output_option=true;
@@ -561,7 +562,7 @@ static void prepare_output_options(Reque
 		if(voptions.is_defined()) {
 			if(HashStringValue *options=voptions.get_hash()) {
 				// $.method[xml|html|text]
-				if(Value* vmethod=options->get(StringBody(XDOC_OUTPUT_METHOD_OPTION_NAME)))
+				if(Value* vmethod=options->get(String::Body(XDOC_OUTPUT_METHOD_OPTION_NAME)))
 					oo.method=&vmethod->as_string();
 
 				// $.version[1.0]
@@ -692,7 +693,7 @@ static void _file(Request& r, MethodPara
 		value_name, 
 		new VString(*oo.mediaType));
 	vhcontent_type.hash().put(
-		StringBody("charset"), 
+		String::Body("charset"), 
 		new VString(*oo.encoding));
 
 	vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, 
@@ -893,10 +894,10 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
     // Node (in Node importedNode, in boolean deep) raises(DOMException)
 	add_native_method("importNode", Method::CT_DYNAMIC, _importNode, 2, 2);
 
-	// Attr createAttributeNS(in DOMString name) raises(DOMException);
+	// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 	add_native_method("createAttributeNS", Method::CT_DYNAMIC, _createAttributeNS, 2, 2);
 
-	// Element createElementNS(in DOMString tagName) raises(DOMException);
+	// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException);
 	add_native_method("createElementNS", Method::CT_DYNAMIC, _createElementNS, 2, 2);
 
 	// NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName);