--- parser3/src/classes/xdoc.C 2003/11/06 08:22:48 1.115 +++ parser3/src/classes/xdoc.C 2005/07/28 11:23:01 1.147 @@ -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 (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: 2005/07/28 11:23:01 $"; #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&, HashStringValue&) { return new VXdoc(0, 0); } public: MXdoc(); -public: // Methoded - void configure_admin(Request& r); }; // global variable @@ -158,13 +157,13 @@ private: // methods -static void writeNode(Request& r, GdomeNode *node, +static void writeNode(Request& r, VXdoc& xdoc, GdomeNode *node, GdomeException exc) { if(!node || exc) throw XmlException(0, exc); // write out result - r.write_no_lang(*new VXnode(&r.charsets, node)); + r.write_no_lang(*new VXnode(&r.charsets, xdoc, node)); } // Element createElement(in DOMString tagName) raises(DOMException); @@ -178,7 +177,7 @@ static void _createElement(Request& r, M (GdomeNode *)gdome_doc_createElement(vdoc.get_document(), r.transcode(tagName).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); @@ -195,7 +194,7 @@ static void _createElementNS(Request& r, r.transcode(namespaceURI).use(), r.transcode(qualifiedName).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // DocumentFragment createDocumentFragment() @@ -207,7 +206,7 @@ static void _createDocumentFragment(Requ (GdomeNode *)gdome_doc_createDocumentFragment( vdoc.get_document(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Text createTextNode(in DOMString data); @@ -221,7 +220,7 @@ static void _createTextNode(Request& r, vdoc.get_document(), r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Comment createComment(in DOMString data) @@ -235,7 +234,7 @@ static void _createComment(Request& r, M vdoc.get_document(), r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // CDATASection createCDATASection(in DOMString data) raises(DOMException); @@ -249,7 +248,7 @@ static void _createCDATASection(Request& vdoc.get_document(), r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); @@ -265,7 +264,7 @@ static void _createProcessingInstruction r.transcode(target).use(), r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Attr createAttribute(in DOMString name) raises(DOMException); @@ -279,7 +278,7 @@ static void _createAttribute(Request& r, vdoc.get_document(), r.transcode(name).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); @@ -296,7 +295,7 @@ static void _createAttributeNS(Request& r.transcode(namespaceURI).use(), r.transcode(qualifiedName).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // EntityReference createEntityReference(in DOMString name) raises(DOMException); @@ -310,7 +309,7 @@ static void _createEntityReference(Reque vdoc.get_document(), r.transcode(name).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // NodeList getElementsByTagName(in DOMString name); @@ -330,9 +329,9 @@ static void _getElementsByTagName(Reques for(gulong i=0; i1?params.as_no_junction(1, "additional params must be hash") - .get_hash() - :0); + const String* uri=¶ms.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( @@ -524,13 +521,13 @@ static void param_option_over_output_opt } static void param_option_over_output_option( HashStringValue& param_options, const char* option_name, - bool& output_option) { + int& output_option) { if(Value* value=param_options.get(String::Body(option_name))) { const String& s=value->as_string(); if(s=="yes") - output_option=true; + output_option=1; else if(s=="no") - output_option=false; + output_option=0; else throw Exception("parser.runtime", &s, @@ -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}] @@ -609,24 +602,33 @@ struct Xdoc2buf_result { static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, MethodParams& params, int index, VXdoc::Output_options& oo, - const String* file_spec) { + const String* file_spec, + bool use_source_charset_to_render_and_client_charset_to_write_to_header=false) { Xdoc2buf_result result; prepare_output_options(r, params, index, oo); - const char* encoding_cstr=oo.encoding->cstr(); - xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr); - if(!encoder) + const char* render_encoding; + const char* header_encoding; + if(use_source_charset_to_render_and_client_charset_to_write_to_header) { + render_encoding=r.charsets.source().NAME_CSTR(); + header_encoding=r.charsets.client().NAME_CSTR(); + } else { + header_encoding=render_encoding=oo.encoding->cstr(); + } + + xmlCharEncodingHandler *renderer=xmlFindCharEncodingHandler(render_encoding); + if(!renderer) throw Exception("parser.runtime", 0, - "encoding '%s' not supported", encoding_cstr); - // UTF-8 encoder contains empty input/output converters, + "encoding '%s' not supported", render_encoding); + // UTF-8 renderer contains empty input/output converters, // which is wrong for xmlOutputBufferCreateIO - // while zero encoder goes perfectly - if(encoder && strcmp(encoder->name, "UTF-8")==0) - encoder=0; + // while zero renderer goes perfectly + if(strcmp(render_encoding, "UTF-8")==0) + renderer=0; - xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder)); + xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(renderer)); xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); if(!stylesheet.get()) @@ -634,25 +636,29 @@ static Xdoc2buf_result xdoc2buf(Request& 0, "xsltNewStylesheet failed"); - #define OOS2STYLE(name) \ + #define OOSTRING2STYLE(name) \ stylesheet->name=oo.name?BAD_CAST xmlMemStrdup(r.transcode(*oo.name)->str):0 - #define OOE2STYLE(name) \ - stylesheet->name=oo.name + #define OOBOOL2STYLE(name) \ + if(oo.name>=0) stylesheet->name=oo.name - OOS2STYLE(method); - OOS2STYLE(encoding); - OOS2STYLE(mediaType); - OOS2STYLE(doctypeSystem); - OOS2STYLE(doctypePublic); - OOE2STYLE(indent); - OOS2STYLE(version); - OOE2STYLE(standalone); - OOE2STYLE(omitXmlDeclaration); + OOSTRING2STYLE(method); + OOSTRING2STYLE(encoding); + OOSTRING2STYLE(mediaType); +// OOSTRING2STYLE(doctypeSystem); +// OOSTRING2STYLE(doctypePublic); + OOBOOL2STYLE(indent); + OOSTRING2STYLE(version); + OOBOOL2STYLE(standalone); + OOBOOL2STYLE(omitXmlDeclaration); xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document()); - if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) { + document->encoding=BAD_CAST xmlMemStrdup(render_encoding); + if(header_encoding) + stylesheet->encoding=BAD_CAST xmlMemStrdup(header_encoding); + if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0 + || xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(0, exc); + throw XmlException(0, exc); } // write out result @@ -665,14 +671,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; } @@ -717,9 +724,10 @@ static void _string(Request& r, MethodPa VXdoc::Output_options oo(vdoc.output_options); Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, oo, - 0/*not to file, to memory*/); + 0/*not to file, to memory*/, + true/*use source charset to render, client charset to put to header*/); // write out result - r.write_no_lang(String(buf.str, buf.length)); + r.write_no_lang(String(String::Body(buf.str), String::L_AS_IS)); } #ifndef DOXYGEN @@ -737,8 +745,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 +766,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,12 +798,10 @@ 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.indent=stylesheet->indent; oo.version=stylesheet->version?&r.transcode(stylesheet->version):0; - oo.standalone=stylesheet->standalone!=0; - oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; + oo.standalone=stylesheet->standalone; + oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration; // return return result; @@ -828,17 +836,17 @@ static void _transform(Request& r, Metho static_cast(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 +856,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 +920,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 +940,6 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, } -void MXdoc::configure_admin(Request& r) { -} - # else #include "classes.h" @@ -945,4 +949,3 @@ void MXdoc::configure_admin(Request& r) DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive #endif -