--- parser3/src/classes/xdoc.C	2003/11/20 17:22:48	1.121
+++ parser3/src/classes/xdoc.C	2003/12/10 14:17:43	1.124
@@ -9,7 +9,7 @@
 
 #ifdef XML
 
-static const char * const IDENT_XDOC_C="$Date: 2003/11/20 17:22:48 $";
+static const char * const IDENT_XDOC_C="$Date: 2003/12/10 14:17:43 $";
 
 #include "gdome.h"
 #include "libxml/tree.h"
@@ -483,19 +483,19 @@ static void _load(Request& r, MethodPara
 	VXdoc& vdoc=GET_SELF(r, VXdoc);
 
 	// filespec
-	const String& file_name=params.as_string(0, "uri must be string");
-	const String& uri=r.absolute(file_name);
-
-	File_read_result file=file_read(r.charsets, uri, false/*not text*/,
-		params.count()>1?params.as_no_junction(1, "additional params must be hash")
-			.get_hash()
-			:0);
+	const String* uri=&params.as_string(0, "uri must be string");
+	const char* uri_cstr;
+	if(uri->pos("://")==STRING_NOT_FOUND) // disk path
+		uri_cstr=r.absolute(*uri).cstr(String::L_FILE_SPEC);
+	else // xxx:// 
+		uri_cstr=uri->cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle
 
+	/// todo!! add SAFE MODE!!
 	GdomeDocument *document=(GdomeDocument *)
-		gdome_xml_n_mkref((xmlNode *)xmlParseMemory(file.str, file.length));
+		gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri_cstr));
 	if(!document || xmlHaveGenericErrors()) {
 		GdomeException exc=0;
-		throw XmlException(&uri, exc);
+		throw XmlException(uri, exc);
 	}
 	// must be first action after if}
 	// replace any previous parsed source
@@ -504,12 +504,12 @@ static void _load(Request& r, MethodPara
 		GdomeException exc;
 		gdome_doc_unref(document, &exc);
 	}
-
-	const char* URI_cstr=uri.cstr();
+/* xmlParseFile does that itself. old peace for xmlParseMemory
+	const char* URI_cstr=uri->cstr();
 	xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document);
 	if(URI_cstr)
 		doc->URL=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr));
-
+*/
 }
 
 static void param_option_over_output_option(
@@ -569,10 +569,6 @@ static void prepare_output_options(Reque
 				param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration);
 				// $.standalone[yes|no]
 				param_option_over_output_option(*options, "standalone", oo.standalone);
-				// $.doctype-public[?]
-				param_option_over_output_option(*options, "doctype-public", oo.doctypePublic);
-				// $.doctype-system[?]
-				param_option_over_output_option(*options, "doctype-system", oo.doctypeSystem);
 				// $.indent[yes|no]
 				param_option_over_output_option(*options, "indent", oo.indent);
 				// $.media-type[text/{html|xml|plain}]
@@ -638,8 +634,8 @@ static Xdoc2buf_result xdoc2buf(Request&
 	OOS2STYLE(method);
 	OOS2STYLE(encoding);
 	OOS2STYLE(mediaType);
-	OOS2STYLE(doctypeSystem);
-	OOS2STYLE(doctypePublic);
+//	OOS2STYLE(doctypeSystem);
+	//OOS2STYLE(doctypePublic);
 	OOE2STYLE(indent);
 	OOS2STYLE(version);
 	OOE2STYLE(standalone);
@@ -785,8 +781,6 @@ static VXdoc& _transform(Request& r, con
 	oo.method=stylesheet->method?&r.transcode(stylesheet->method):0;
 	oo.encoding=stylesheet->encoding?&r.transcode(stylesheet->encoding):0;
 	oo.mediaType=stylesheet->mediaType?&r.transcode(stylesheet->mediaType):0;
-	oo.doctypeSystem=stylesheet->doctypeSystem?&r.transcode(stylesheet->doctypeSystem):0;
-	oo.doctypePublic=stylesheet->doctypePublic?&r.transcode(stylesheet->doctypePublic):0;
 	oo.indent=stylesheet->indent!=0;
 	oo.version=stylesheet->version?&r.transcode(stylesheet->version):0;
 	oo.standalone=stylesheet->standalone!=0;
@@ -849,8 +843,7 @@ static void _transform(Request& r, Metho
 
 		// load and compile file to stylesheet [or get cached if any]
 		// transform!
-		result=&_transform(r, &stylesheet_filespec,
-			vdoc, connection->stylesheet(false/*nocache*/),
+		result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(),
 			transform_params);
 	}
 
@@ -910,7 +903,7 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 	add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1);
 
 	// ^xdoc::load[some.xml]
-	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2);
+	add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1);
 
 	// ^xdoc.save[some.xml]
 	// ^xdoc.save[some.xml;options hash]
@@ -939,4 +932,3 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive
 
 #endif
-