--- parser3/src/classes/xdoc.C	2002/08/19 09:48:39	1.99
+++ parser3/src/classes/xdoc.C	2002/11/25 14:57:32	1.106
@@ -8,7 +8,7 @@
 #include "classes.h"
 #ifdef XML
 
-static const char* IDENT_XDOC_C="$Date: 2002/08/19 09:48:39 $";
+static const char* IDENT_XDOC_C="$Date: 2002/11/25 14:57:32 $";
 
 #include "pa_stylesheet_connection.h"
 #include "pa_request.h"
@@ -170,7 +170,7 @@ static void writeNode(Request& r,  const
 // Element createElement(in DOMString tagName) raises(DOMException);
 static void _createElement(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& tagName=params->as_string(0, "tagName must be string");
 
@@ -185,7 +185,7 @@ static void _createElement(Request& r, c
 // DocumentFragment createDocumentFragment()
 static void _createDocumentFragment(Request& r, const String& method_name, MethodParams *) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	GdomeException exc;
 	GdomeNode *node=
@@ -198,7 +198,7 @@ static void _createDocumentFragment(Requ
 // Text createTextNode(in DOMString data);
 static void _createTextNode(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& data=params->as_string(0, "data must be string");
 
@@ -213,7 +213,7 @@ static void _createTextNode(Request& r,
 // Comment createComment(in DOMString data)
 static void _createComment(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& data=params->as_string(0, "data must be string");
 
@@ -228,7 +228,7 @@ static void _createComment(Request& r, c
 // CDATASection createCDATASection(in DOMString data) raises(DOMException);
 static void _createCDATASection(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& data=params->as_string(0, "data must be string");
 
@@ -243,7 +243,7 @@ static void _createCDATASection(Request&
 // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException);
 static void _createProcessingInstruction(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& target=params->as_string(0, "data must be string");
 	const String& data=params->as_string(1, "data must be string");
@@ -260,7 +260,7 @@ static void _createProcessingInstruction
 // Attr createAttribute(in DOMString name) raises(DOMException);
 static void _createAttribute(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& name=params->as_string(0, "name must be string");
 
@@ -274,7 +274,7 @@ static void _createAttribute(Request& r,
 // EntityReference createEntityReference(in DOMString name) raises(DOMException);
 static void _createEntityReference(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& name=params->as_string(0, "name must be string");
 
@@ -289,7 +289,7 @@ static void _createEntityReference(Reque
 // NodeList getElementsByTagName(in DOMString name);
 static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& name=params->as_string(0, "name must be string");
 
@@ -322,7 +322,7 @@ static void _getElementsByTagName(Reques
 
 static void _getElementsByTagNameNS(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	// namespaceURI;localName
 	const String& namespaceURI=params->as_string(0, "namespaceURI must be string");
@@ -355,7 +355,7 @@ static void _getElementsByTagNameNS(Requ
 
 static void _getElementById(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	// elementId
 	const String& elementId=params->as_string(0, "elementID must be string");
@@ -376,7 +376,7 @@ static void _getElementById(Request& r,
 
 static void _importNode(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	GdomeNode *importedNode=
 		as_node(method_name, params, 0, "importedNode must be node");
@@ -402,7 +402,7 @@ GdomeAttr *gdome_doc_createAttributeNS (
 
 static void _create(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	Value& param=params->get(params->size()-1);
 	GdomeDocument *document;
@@ -447,6 +447,10 @@ static void _create(Request& r, const St
 				&method_name, 
 				exc);
 
+		xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
+		const char *source_charset_name=pool.get_source_charset().name().cstr();
+		doc->encoding=pool.get_source_charset().transcode_buf2xchar(source_charset_name, strlen(source_charset_name));
+
 		/// +xalan createXMLDecl ?
 	}
 	
@@ -467,14 +471,19 @@ static void _create(Request& r, const St
 
 static void _load(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	// filespec
 	const String& file_name=params->as_string(0, "uri must be string");
 	const String& uri=r.absolute(file_name);
-	
+
+	void *data;  size_t size;
+	file_read(pool, uri, data, size, false/*not text*/,
+		params->size()>1?params->as_no_junction(1, "additional params must be hash").get_hash(&method_name)
+			:0);
+
 	GdomeDocument *document=(GdomeDocument *)
-		gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr()));
+		gdome_xml_n_mkref((xmlNode *)xmlParseMemory((const char *)data, size));
 	if(!document || xmlHaveGenericErrors()) {
 		GdomeException exc=0;
 		throw Exception(
@@ -510,6 +519,7 @@ static void param_option_over_output_opt
 	}
 }
 
+/// @test valid_options check
 static void prepare_output_options(
 								   Pool& pool, const String& method_name, MethodParams *params, int index,
 								   VXdoc::Output_options& oo) {
@@ -648,7 +658,7 @@ static void xdoc2buf(Pool& pool, VXdoc&
 
 static void _file(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 	VXdoc::Output_options oo(vdoc.output_options);
 	char *buf; size_t buf_size;
 	xdoc2buf(pool, vdoc, method_name, params, 0, 
@@ -670,13 +680,14 @@ static void _file(Request& r, const Stri
 		new(pool) VString(*oo.encoding));
 	vcontent_type=vhcontent_type;
 	
-	vfile.set(false/*tainted*/, buf, buf_size, 0/*file_name*/, vcontent_type);
+	vfile.set(false/*tainted*/, buf?buf:""/*to distinguish from stat-ed file*/, buf_size, 
+		0/*file_name*/, vcontent_type);
 	r.write_no_lang(vfile);
 }
 
 static void _save(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	const String& file_spec=r.absolute(params->as_string(0, "file name must be string"));
 	
@@ -689,7 +700,7 @@ static void _save(Request& r, const Stri
 
 static void _string(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 	VXdoc::Output_options oo(vdoc.output_options);
 	char *buf; size_t buf_size;
 	xdoc2buf(pool, vdoc, method_name, params, 0, 
@@ -759,13 +770,13 @@ static VXdoc& _transform(Pool& pool, con
 	memset(&result.output_options, 0, sizeof(result.output_options));
 	VXdoc::Output_options& oo=result.output_options;
 
-	oo.method=stylesheet->method?&pool.transcode(stylesheet->method):0;
-	oo.encoding=stylesheet->encoding?&pool.transcode(stylesheet->encoding):0;
-	oo.mediaType=stylesheet->mediaType?&pool.transcode(stylesheet->mediaType):0;
-	oo.doctypeSystem=stylesheet->doctypeSystem?&pool.transcode(stylesheet->doctypeSystem):0;
-	oo.doctypePublic=stylesheet->doctypePublic?&pool.transcode(stylesheet->doctypePublic):0;
+	oo.method=stylesheet->method?&pool.transcode(stylesheet->method, stylesheet_source):0;
+	oo.encoding=stylesheet->encoding?&pool.transcode(stylesheet->encoding, stylesheet_source):0;
+	oo.mediaType=stylesheet->mediaType?&pool.transcode(stylesheet->mediaType, stylesheet_source):0;
+	oo.doctypeSystem=stylesheet->doctypeSystem?&pool.transcode(stylesheet->doctypeSystem, stylesheet_source):0;
+	oo.doctypePublic=stylesheet->doctypePublic?&pool.transcode(stylesheet->doctypePublic, stylesheet_source):0;
 	oo.indent=stylesheet->indent!=0;
-	oo.version=stylesheet->version?&pool.transcode(stylesheet->version):0;
+	oo.version=stylesheet->version?&pool.transcode(stylesheet->version, stylesheet_source):0;
 	oo.standalone=stylesheet->standalone!=0;
 	oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0;
 
@@ -774,13 +785,13 @@ static VXdoc& _transform(Pool& pool, con
 }
 static void _transform(Request& r, const String& method_name, MethodParams *params) {
 	Pool& pool=r.pool();
-	VXdoc& vdoc=*static_cast<VXdoc *>(r.self);
+	VXdoc& vdoc=*static_cast<VXdoc *>(r.get_self());
 
 	// params
 	const char **transform_params=0;
 	if(params->size()>1) {
 		Value& vparams=params->as_no_junction(1, "transform parameters must be hash");
-		if(vparams.is_defined())
+		if(!vparams.is_string())
 			if(Hash *params=vparams.get_hash(&method_name)) {
 				const char **current_transform_param=transform_params=
 					(const char **)pool.malloc(sizeof(const char *)*(params->size()*2+1));
@@ -878,7 +889,7 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool
 	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1);
 
 	// ^xdoc::load[some.xml]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
 
 	// ^xdoc.save[some.xml]
 	// ^xdoc.save[some.xml;options hash]