--- parser3/src/classes/xdoc.C	2003/11/06 08:22:48	1.115
+++ parser3/src/classes/xdoc.C	2004/02/18 11:47:04	1.138
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b xdoc parser class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
@@ -9,15 +9,16 @@
 
 #ifdef XML
 
-static const char* IDENT_XDOC_C="$Date: 2003/11/06 08:22:48 $";
+static const char * const IDENT_XDOC_C="$Date: 2004/02/18 11:47:04 $";
 
 #include "gdome.h"
 #include "libxml/tree.h"
+#include "libxml/HTMLtree.h"
 #include "libxslt/xsltInternals.h"
 #include "libxslt/transform.h"
 #include "libxslt/xsltutils.h"
 #include "libxslt/variables.h"
-
+#include "libxslt/imports.h"
 
 #include "pa_vmethod_frame.h"
 
@@ -42,13 +43,11 @@ static const char* IDENT_XDOC_C="$Date:
 
 class MXdoc: public MXnode {
 public: // VStateless_class
-	Value* create_new_value() { return new VXdoc(0, 0); }
+	Value* create_new_value(Pool&) { return new VXdoc(0, 0); }
 
 public:
 	MXdoc();
 
-public: // Methoded
-	void configure_admin(Request& r);
 };
 
 // global variable
@@ -332,7 +331,7 @@ static void _getElementsByTagName(Reques
 				String::Body::Format(i), 
 				new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc)));
 	} else if(exc)
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 
 	// write out result
 	r.write_no_lang(result);
@@ -378,9 +377,7 @@ static void _getElementById(Request& r,
 		// write out result
 		r.write_no_lang(*new VXnode(&r.charsets, node));
 	} else if(exc || xmlHaveGenericErrors())
-		throw Exception(
-			&elementId, 
-			exc);
+		throw XmlException(&elementId, exc);
 }
 
 static void _importNode(Request& r, MethodParams& params) {
@@ -396,7 +393,7 @@ static void _importNode(Request& r, Meth
 		importedNode,
 		deep, &exc);
 	if(exc)
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 
 	// write out result
 	r.write_no_lang(*new VXnode(&r.charsets, outputNode));
@@ -417,7 +414,7 @@ static void _create(Request& r, MethodPa
 		Temp_lang temp_lang(r, String::L_XML);
 		const String& xml=r.process_to_string(param);
 
-		const char* cstr=xml.cstr(String::L_UNSPECIFIED);
+		const char* cstr=xml.cstr(String::L_UNSPECIFIED, 0, &r.charsets);
 		document=(GdomeDocument *)
 			gdome_xml_n_mkref((xmlNode *)xmlParseMemory(
 				cstr, strlen(cstr)
@@ -425,7 +422,7 @@ static void _create(Request& r, MethodPa
 		//printf("document=0x%p\n", document);
 		if(!document || xmlHaveGenericErrors()) {
 			GdomeException exc=0;
-			throw Exception(0, exc);
+			throw XmlException(0, exc);
 		}
 
 		// must be last action in if, see after if}
@@ -433,26 +430,26 @@ static void _create(Request& r, MethodPa
 		const String& qualifiedName=param.as_string();
 
 		GdomeException exc;
-		/*
+#if 0
 		GdomeDocumentType *documentType=gdome_di_createDocumentType (
 			docimpl, 
 			r.transcode(qualifiedName), 
-			0/*publicId* /, 
-			0/*systemId* /, 
+			0/*publicId*/, 
+			0/*systemId*/, 
 			&exc);
 		if(!documentType || exc || xmlHaveGenericErrors())
 			throw Exception(
 				method_name, 
 				exc);
 		/// +xalan createXMLDecl ?
-		*/
-		document=gdome_di_createDocument (domimpl, 
+#endif
+		document=gdome_di_createDocument(domimpl, 
 			0/*namespaceURI*/, 
 			r.transcode(qualifiedName).use(), 
 			0/*doctype*/, 
 			&exc);
 		if(!document || exc || xmlHaveGenericErrors())
-			throw Exception(0, exc);
+			throw XmlException(0, exc);
 
 		set_encoding=true;
 		// must be last action in if, see after if}
@@ -487,19 +484,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 Exception(&uri, exc);
+		throw XmlException(uri, exc);
 	}
 	// must be first action after if}
 	// replace any previous parsed source
@@ -508,12 +505,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(
@@ -573,10 +570,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}]
@@ -602,6 +595,169 @@ static void prepare_output_options(Reque
 	}
 }
 
+/// patching piecees from libxslt and libxml not to set meta encoding
+static int
+pa_xsltSaveResultTo(xmlOutputBufferPtr buf, xmlDocPtr result,
+	       xsltStylesheetPtr style) {
+    const xmlChar *encoding;
+    int base;
+    const xmlChar *method;
+    int indent;
+
+    if ((buf == NULL) || (result == NULL) || (style == NULL))
+	return(-1);
+    if ((result->children == NULL) ||
+	((result->children->type == XML_DTD_NODE) &&
+	 (result->children->next == NULL)))
+	return(0);
+
+    if ((style->methodURI != NULL) &&
+	((style->method == NULL) ||
+	 (!xmlStrEqual(style->method, (const xmlChar *) "xhtml")))) {
+        xsltGenericError(xsltGenericErrorContext,
+		"xsltSaveResultTo : unknown ouput method\n");
+        return(-1);
+    }
+
+    base = buf->written;
+
+    XSLT_GET_IMPORT_PTR(method, style, method)
+    XSLT_GET_IMPORT_PTR(encoding, style, encoding)
+    XSLT_GET_IMPORT_INT(indent, style, indent);
+
+    if ((method == NULL) && (result->type == XML_HTML_DOCUMENT_NODE))
+	method = BAD_CAST "html";
+
+    if ((method != NULL) &&
+	(xmlStrEqual(method, (const xmlChar *) "html"))) {
+	if (indent == -1)
+	    indent = 1;
+
+    int is_xhtml = 0;
+    xmlDtdPtr dtd = xmlGetIntSubset(result);
+    if (dtd != NULL) {
+        is_xhtml = xmlIsXHTML(dtd->SystemID, dtd->ExternalID);
+        if (is_xhtml < 0)
+            is_xhtml = 0;
+	}
+	xmlNodePtr cur=result->last;
+	if(!cur) {
+		is_xhtml=0;
+	}
+
+	if(is_xhtml) {
+		// xhtmlNodeDumpOutput is static :(
+		if((cur->parent == (xmlNodePtr) result) &&
+            (cur->type == XML_ELEMENT_NODE) &&
+			(xmlStrEqual(cur->name, BAD_CAST "html"))) {
+			//cur->name=BAD_CAST "html ";
+		}
+
+		method = BAD_CAST "xml";
+	} else {
+		htmlDocContentDumpFormatOutput(buf, result, (const char *) encoding,
+		                       indent);
+		xmlOutputBufferFlush(buf);
+		goto finish;
+	}
+	}
+    
+	if ((method != NULL) &&
+	       (xmlStrEqual(method, (const xmlChar *) "text"))) {
+	xmlNodePtr cur;
+
+	cur = result->children;
+	while (cur != NULL) {
+	    if (cur->type == XML_TEXT_NODE)
+		xmlOutputBufferWriteString(buf, (const char *) cur->content);
+
+	    /*
+	     * Skip to next node
+	     */
+	    if (cur->children != NULL) {
+		if ((cur->children->type != XML_ENTITY_DECL) &&
+		    (cur->children->type != XML_ENTITY_REF_NODE) &&
+		    (cur->children->type != XML_ENTITY_NODE)) {
+		    cur = cur->children;
+		    continue;
+		}
+	    }
+	    if (cur->next != NULL) {
+		cur = cur->next;
+		continue;
+	    }
+	    
+	    do {
+		cur = cur->parent;
+		if (cur == NULL)
+		    break;
+		if (cur == (xmlNodePtr) style->doc) {
+		    cur = NULL;
+		    break;
+		}
+		if (cur->next != NULL) {
+		    cur = cur->next;
+		    break;
+		}
+	    } while (cur != NULL);
+	}
+	xmlOutputBufferFlush(buf);
+    } else {
+	int omitXmlDecl;
+	int standalone;
+
+	XSLT_GET_IMPORT_INT(omitXmlDecl, style, omitXmlDeclaration);
+	XSLT_GET_IMPORT_INT(standalone, style, standalone);
+
+	if (omitXmlDecl != 1) {
+	    xmlOutputBufferWriteString(buf, "<?xml version=");
+	    if (result->version != NULL) 
+		xmlBufferWriteQuotedString(buf->buffer, result->version);
+	    else
+		xmlOutputBufferWriteString(buf, "\"1.0\"");
+	    if (encoding == NULL) {
+		if (result->encoding != NULL)
+		    encoding = result->encoding;
+		else if (result->charset != XML_CHAR_ENCODING_UTF8)
+		    encoding = (const xmlChar *)
+			       xmlGetCharEncodingName((xmlCharEncoding)
+			                              result->charset);
+	    }
+	    if (encoding != NULL) {
+		xmlOutputBufferWriteString(buf, " encoding=");
+		xmlBufferWriteQuotedString(buf->buffer, (xmlChar *) encoding);
+	    }
+	    switch (standalone) {
+		case 0:
+		    xmlOutputBufferWriteString(buf, " standalone=\"no\"");
+		    break;
+		case 1:
+		    xmlOutputBufferWriteString(buf, " standalone=\"yes\"");
+		    break;
+		default:
+		    break;
+	    }
+	    xmlOutputBufferWriteString(buf, "?>\n");
+	}
+	if (result->children != NULL) {
+	    xmlNodePtr child = result->children;
+
+	    while (child != NULL) {
+		xmlNodeDumpOutput(buf, result, child, 0, (indent == 1),
+			          (const char *) encoding);
+		if (child->type == XML_DTD_NODE)
+		    xmlOutputBufferWriteString(buf, "\n");
+		child = child->next;
+	    }
+	    xmlOutputBufferWriteString(buf, "\n");
+	}
+	xmlOutputBufferFlush(buf);
+    }
+finish:
+    return(buf->written - base);
+}
+
+
 struct Xdoc2buf_result {
 	char* str;
 	size_t length;
@@ -623,7 +779,8 @@ static Xdoc2buf_result xdoc2buf(Request&
 	// UTF-8 encoder contains empty input/output converters, 
 	// which is wrong for xmlOutputBufferCreateIO
 	// while zero encoder goes perfectly 
-	if(encoder && strcmp(encoder->name, "UTF-8")==0)
+	const char* encoder_name=encoder->name;
+	if(strcmp(encoder_name, "UTF-8")==0)
 		encoder=0;
 
 	xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder));
@@ -642,17 +799,18 @@ 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);
 	OOE2STYLE(omitXmlDeclaration);
 
 	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
-	if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
+	document->encoding=BAD_CAST xmlMemStrdup(encoder_name);
+	if(pa_xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) {
 		GdomeException exc=0;
-		throw Exception(0, exc);
+		throw XmlException(0, exc);
 	}
 
 	// write out result
@@ -665,14 +823,15 @@ static Xdoc2buf_result xdoc2buf(Request&
 		gnome_str=(char *)outputBuffer->buffer->content;
 	}
 
+	if((result.length=gnome_length)) {
+		result.str=pa_strdup(gnome_str, gnome_length);
+	} else
+		result.str=0;
+
 	if(file_spec)
 		file_write(*file_spec,
 			gnome_str, gnome_length, 
 			true/*as_text*/);
-	else if(result.length=gnome_length) {
-		result.str=pa_strdup(gnome_str, gnome_length);
-	} else
-		result.str=0;
 
 	return result;
 }
@@ -737,8 +896,10 @@ static void add_xslt_param(
 	*info->current_transform_param++=(s=info->r->transcode(attribute))->str; *info->strings+=s;
 	*info->current_transform_param++=(s=info->r->transcode(meaning->as_string()))->str; *info->strings+=s;
 }
+
 static VXdoc& _transform(Request& r, const String* stylesheet_source, 
-						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) {
+						   VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) 
+{
 	xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document());
 	xsltTransformContext_auto_ptr transformContext(
 		xsltNewTransformContext(stylesheet, document));
@@ -756,7 +917,7 @@ static VXdoc& _transform(Request& r, con
 		transformContext.get());
 	if(!transformed || xmlHaveGenericErrors()) {
 		GdomeException exc=0;
-		throw Exception(stylesheet_source, exc);
+		throw XmlException(stylesheet_source, exc);
 	}
 
 	//gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE  type, fixing
@@ -788,8 +949,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;
@@ -828,17 +987,17 @@ static void _transform(Request& r, Metho
 			static_cast<VXdoc *>(vxdoc)->get_document());
 		// compile xdoc stylesheet
 		xsltStylesheet_auto_ptr stylesheet_ptr(xsltParseStylesheetDoc(document)); 
-		// strange thing - xsltParseStylesheetDoc records document and destroys it in stylesheet destructor
-		// we don't need that
-		stylesheet_ptr->doc=0;
 		if(xmlHaveGenericErrors()) {
 			GdomeException exc=0;
-			throw Exception(0, exc);
+			throw XmlException(0, exc);
 		}
 		if(!stylesheet_ptr.get())
 			throw Exception("xml",
 				0,
 				"stylesheet failed to compile");
+		// strange thing - xsltParseStylesheetDoc records document and destroys it in stylesheet destructor
+		// we don't need that
+		stylesheet_ptr->doc=0;
 
 		// transform!
 		result=&_transform(r, 0,
@@ -848,12 +1007,11 @@ static void _transform(Request& r, Metho
 		// extablish stylesheet connection
 		const String& stylesheet_filespec=
 			r.absolute(params.as_string(0, "stylesheet must be file name (string) or DOM document (xdoc)"));
-		Stylesheet_connection_ptr connection=stylesheet_manager.get_connection(stylesheet_filespec);
+		Stylesheet_connection_ptr connection=stylesheet_manager->get_connection(stylesheet_filespec);
 
 		// 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);
 	}
 
@@ -913,7 +1071,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]
@@ -933,9 +1091,6 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME,
 
 }
 
-void MXdoc::configure_admin(Request& r) {
-}
-
 # else
 
 #include "classes.h"
@@ -945,4 +1100,3 @@ void MXdoc::configure_admin(Request& r)
 DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive
 
 #endif
-