--- parser3/src/classes/xdoc.C 2007/04/23 10:30:10 1.154 +++ parser3/src/classes/xdoc.C 2021/10/19 16:16:35 1.201 @@ -1,7 +1,7 @@ /** @file Parser: @b xdoc parser class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,8 +9,6 @@ #ifdef XML -static const char * const IDENT_XDOC_C="$Date: 2007/04/23 10:30:10 $"; - #include "libxml/tree.h" #include "libxml/HTMLtree.h" #include "libxslt/xsltInternals.h" @@ -28,21 +26,19 @@ static const char * const IDENT_XDOC_C=" #include "pa_vfile.h" #include "pa_xml_exception.h" #include "xnode.h" +#include "pa_charsets.h" + +volatile const char * IDENT_XDOC_C="$Id: xdoc.C,v 1.201 2021/10/19 16:16:35 moko Exp $"; // defines #define XDOC_CLASS_NAME "xdoc" -#define XDOC_OUTPUT_METHOD_OPTION_NAME "method" -#define XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "xml" -#define XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "html" -#define XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "text" - // class class MXdoc: public MXnode { public: // VStateless_class - Value* create_new_value(Pool&, HashStringValue&) { return new VXdoc(); } + Value* create_new_value(Pool&) { return new VXdoc(); } public: MXdoc(); @@ -51,7 +47,8 @@ public: // global variable -DECLARE_CLASS_VAR(xdoc, new MXdoc, 0); +DECLARE_CLASS_VAR(xnode, new MXnode); // must be here as Xdoc is inherited from Xnode and should be inited before +DECLARE_CLASS_VAR(xdoc, new MXdoc); // helper classes @@ -121,39 +118,6 @@ private: xsltTransformContext *_Ptr; }; -class xsltStylesheet_auto_ptr { -public: - explicit xsltStylesheet_auto_ptr(xsltStylesheet *_APtr = 0) - : _Owns(_APtr != 0), _Ptr(_APtr) {} - xsltStylesheet_auto_ptr(const xsltStylesheet_auto_ptr& _Y) - : _Owns(_Y._Owns), _Ptr(_Y.release()) {} - xsltStylesheet_auto_ptr& operator=(const xsltStylesheet_auto_ptr& _Y) - {if (this != &_Y) - {if (_Ptr != _Y.get()) - {if (_Owns && _Ptr) - xsltFreeStylesheet(_Ptr); - _Owns = _Y._Owns; } - else if (_Y._Owns) - _Owns = true; - _Ptr = _Y.release(); } - return (*this); } - ~xsltStylesheet_auto_ptr() - {if (_Owns && _Ptr) - xsltFreeStylesheet(_Ptr); } - xsltStylesheet& operator*() const - {return (*get()); } - xsltStylesheet *operator->() const - {return (get()); } - xsltStylesheet *get() const - {return (_Ptr); } - xsltStylesheet *release() const - {((xsltStylesheet_auto_ptr *)this)->_Owns = false; - return (_Ptr); } -private: - bool _Owns; - xsltStylesheet *_Ptr; -}; - // methods static void writeNode(Request& r, VXdoc& xdoc, xmlNode* node) { @@ -163,7 +127,7 @@ static void writeNode(Request& r, VXdoc& "error creating node"); // OOM, bad name, things like that // write out result - r.write_no_lang(xdoc.wrap(*node)); + r.write(xdoc.wrap(*node)); } struct IdsIteratorInfo { @@ -171,9 +135,8 @@ struct IdsIteratorInfo { xmlNode *element; }; -/* Hash Scanner function for pa_getElementById */ -extern "C" void // switching to calling convetion of libxml -idsHashScanner (void *payload, void *data, xmlChar *name) { +/* switching to calling convetion of libxml */ +extern "C" void idsHashScanner (void *payload, void *data, const xmlChar *name) { IdsIteratorInfo *priv = (IdsIteratorInfo *)data; if (priv->element == NULL && xmlStrEqual (name, priv->elementId)) @@ -184,11 +147,10 @@ idsHashScanner (void *payload, void *dat } } -static xmlNode* -pa_getElementById(xmlDoc& xmldoc, xmlChar* elementId) { +static xmlNode* pa_getElementById(xmlDoc& xmldoc, xmlChar* elementId) { xmlHashTable *ids = (xmlHashTable *)xmldoc.ids; IdsIteratorInfo iter={elementId, NULL}; - xmlHashScan(ids, idsHashScanner, &iter); + xmlHashScan(ids, (xmlHashScanner)idsHashScanner, &iter); return iter.element; } @@ -222,24 +184,23 @@ pa_importNode (xmlDoc& xmldoc, xmlNode& // Element createElement(in DOMString tagName) raises(DOMException); static void _createElement(Request& r, MethodParams& params) { + xmlChar* tagName=as_xmlname(r, params, 0, "tagName must be string"); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* tagName=as_xmlchar(r, params, 0, "tagName must be string"); - xmlNode *node=xmlNewDocNode(&xmldoc, NULL, tagName, NULL); writeNode(r, vdoc, node); } // Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); static void _createElementNS(Request& r, MethodParams& params) { + xmlChar* namespaceURI=as_xmlnsuri(r, params, 0); + xmlChar* qualifiedName=as_xmlqname(r, params, 1); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - // namespaceURI;localName - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - xmlChar* qualifiedName=as_xmlchar(r, params, 1, "qualifiedName must be string"); - xmlChar* prefix=0; xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix); @@ -263,20 +224,20 @@ static void _createDocumentFragment(Requ // Text createTextNode(in DOMString data); static void _createTextNode(Request& r, MethodParams& params) { + xmlChar* data=as_xmlchar(r, params, 0, XML_DATA_MUST_BE_STRING); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* data=as_xmlchar(r, params, 0, "data must be string"); - xmlNode *node=xmlNewDocText(&xmldoc, data); writeNode(r, vdoc, node); } // Comment createComment(in DOMString data) static void _createComment(Request& r, MethodParams& params) { - VXdoc& vdoc=GET_SELF(r, VXdoc); + xmlChar* data=as_xmlchar(r, params, 0, XML_DATA_MUST_BE_STRING); - xmlChar* data=as_xmlchar(r, params, 0, "data must be string"); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlNode *node=xmlNewComment(data); writeNode(r, vdoc, node); @@ -284,46 +245,46 @@ static void _createComment(Request& r, M // CDATASection createCDATASection(in DOMString data) raises(DOMException); static void _createCDATASection(Request& r, MethodParams& params) { + xmlChar* data=as_xmlchar(r, params, 0, XML_DATA_MUST_BE_STRING); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* data=as_xmlchar(r, params, 0, "data must be string"); - xmlNode *node=xmlNewCDataBlock(&xmldoc, data, strlen((const char*)data)); writeNode(r, vdoc, node); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); static void _createProcessingInstruction(Request& r, MethodParams& params) { + xmlChar* target=as_xmlchar(r, params, 0, XML_DATA_MUST_BE_STRING); + xmlChar* data=as_xmlchar(r, params, 1, XML_DATA_MUST_BE_STRING); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* target=as_xmlchar(r, params, 0, "data must be string"); - xmlChar* data=as_xmlchar(r, params, 1, "data must be string"); - xmlNode *node=xmlNewDocPI(&xmldoc, target, data); writeNode(r, vdoc, node); } // Attr createAttribute(in DOMString name) raises(DOMException); static void _createAttribute(Request& r, MethodParams& params) { + xmlChar* name=as_xmlname(r, params, 0); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); - xmlNode *node=(xmlNode*)xmlNewDocProp(&xmldoc, name, 0); writeNode(r, vdoc, node); } // Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); static void _createAttributeNS(Request& r, MethodParams& params) { + xmlChar* namespaceURI=as_xmlnsuri(r, params, 0); + xmlChar* qualifiedName=as_xmlqname(r, params, 1); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* namespaceURI=as_xmlchar(r, params, 0, "namespaceURI must be string"); - xmlChar* qualifiedName=as_xmlchar(r, params, 1, "name must be string"); - xmlChar* prefix=0; xmlChar* localName=xmlSplitQName2(qualifiedName, &prefix); @@ -339,46 +300,38 @@ static void _createAttributeNS(Request& // EntityReference createEntityReference(in DOMString name) raises(DOMException); static void _createEntityReference(Request& r, MethodParams& params) { + xmlChar* name=as_xmlname(r, params, 0); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlChar* name=as_xmlchar(r, params, 0, "name must be string"); - xmlNode *node=xmlNewReference(&xmldoc, name); writeNode(r, vdoc, node); } static void _getElementById(Request& r, MethodParams& params) { + xmlChar* elementId=as_xmlname(r, params, 0, "elementID must be string"); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - // elementId - xmlChar* elementId=as_xmlchar(r, params, 0, "elementID must be string"); - - if(xmlNode *node=pa_getElementById(xmldoc, elementId)) { - // write out result + if(xmlNode *node=pa_getElementById(xmldoc, elementId)) writeNode(r, vdoc, node); - } } static void _importNode(Request& r, MethodParams& params) { + xmlNode& importedNode=as_node(params, 0, "importedNode must be node"); + bool deep=params.as_bool(1, "deep must be bool", r); + VXdoc& vdoc=GET_SELF(r, VXdoc); xmlDoc& xmldoc=vdoc.get_xmldoc(); - xmlNode& importedNode= - as_node(params, 0, "importedNode must be node"); - bool deep= - params.as_bool(1, "deep must be bool", r); - xmlNode *node=xmlDocCopyNode(&importedNode, &xmldoc, deep?1: 0); - // write out result writeNode(r, vdoc, node); } -/* -GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc); -GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc); -*/ + +#define XML_PARSE_OPTIONS (XML_PARSE_DTDLOAD | XML_PARSE_NOENT | XML_PARSE_HUGE) static void _create(Request& r, MethodParams& params) { Charset& source_charset=r.charsets.source(); @@ -388,46 +341,37 @@ static void _create(Request& r, MethodPa xmlDoc* xmldoc; bool set_encoding=false; if(param.get_junction()) { // {...} - Temp_lang temp_lang(r, String::L_XML); + const String& xml=r.process_to_string(param); + String::Body sbody=xml.cstr_to_string_body_untaint(String::L_XML, r.connection(false), &r.charsets); + + xmldoc=xmlReadMemory(sbody.cstr(), sbody.length(), NULL, NULL, XML_PARSE_OPTIONS); - const char* cstr=xml.cstr(String::L_UNSPECIFIED, 0, &r.charsets); - xmldoc=xmlParseMemory(cstr, strlen(cstr)); - //printf("document=0x%p\n", document); if(!xmldoc || xmlHaveGenericErrors()) - throw XmlException(0); + throw XmlException(0, r); // must be last action in if, see after if} } else { // [localName] if(const String* value = param.get_string()){ xmlChar* localName=r.transcode(*value); -#if 0 - GdomeDocumentType *documentType=gdome_di_createDocumentType ( - docimpl, - r.transcode(qualifiedName), - 0/*publicId*/, - 0/*systemId*/, - &exc); - if(!documentType || exc || xmlHaveGenericErrors()) - throw Exception( - method_name, - exc); - /// +xalan createXMLDecl ? -#endif + if(xmlValidateNCName(localName, 0) != 0) + throw XmlException(0, XML_INVALID_LOCAL_NAME, localName); + xmldoc=xmlNewDoc(0); if(!xmldoc || xmlHaveGenericErrors()) - throw XmlException(0); + throw XmlException(0, r); + xmlNode* node=xmlNewChild((xmlNode*)xmldoc, NULL, localName, NULL); if(!node || xmlHaveGenericErrors()) - throw XmlException(0); + throw XmlException(0, r); set_encoding=true; // must be last action in if, see after if} } else { - VFile* vfile=param.as_vfile(String::L_UNSPECIFIED); - xmldoc=xmlParseMemory(vfile->value_ptr(), vfile->value_size()); + VFile* vfile=param.as_vfile(); + xmldoc=xmlReadMemory(vfile->value_ptr(), vfile->value_size(), NULL, NULL, XML_PARSE_OPTIONS); if(!xmldoc || xmlHaveGenericErrors()) - throw XmlException(0); + throw XmlException(0, r); } } // must be first action after if} @@ -438,7 +382,7 @@ static void _create(Request& r, MethodPa const char* URI_cstr; if(params.count()>1) { // absolute(param) const String& URI=params.as_string(0, "URI must be string"); - URI_cstr=r.absolute(URI).cstr(); + URI_cstr=r.full_disk_path(URI).cstr(); } else // default = disk path to requested document URI_cstr=r.request_info.path_translated; if(URI_cstr) @@ -454,145 +398,50 @@ static void _load(Request& r, MethodPara VXdoc& vdoc=GET_SELF(r, VXdoc); // filespec - const String* uri=¶ms.as_string(0, "uri must be string"); + 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); + uri_cstr=r.full_disk_path(*uri).taint_cstr(String::L_FILE_SPEC); else // xxx:// - uri_cstr=uri->cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle + uri_cstr=uri->taint_cstr(String::L_AS_IS); // leave as-is for xmlParseFile to handle - /// todo!! add SAFE MODE!! - xmlDoc* xmldoc=xmlParseFile(uri_cstr); + /// @todo!! add SAFE MODE!! + xmlDoc* xmldoc=xmlReadFile(uri_cstr, NULL, XML_PARSE_OPTIONS); if(!xmldoc || xmlHaveGenericErrors()) - throw XmlException(uri); + throw XmlException(uri, r); // must be first action after if} // replace any previous parsed source vdoc.set_xmldoc(r.charsets, *xmldoc); } -static void param_option_over_output_option( - HashStringValue& param_options, const char* option_name, - const String*& output_option) { - 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, - int& output_option) { - if(Value* value=param_options.get(String::Body(option_name))) { - const String& s=value->as_string(); - if(s=="yes") - output_option=1; - else if(s=="no") - output_option=0; - else - throw Exception(PARSER_RUNTIME, - &s, - "%s must be either 'yes' or 'no'", option_name); - } -} - -/// @test valid_options check -static void prepare_output_options(Request& r, - MethodParams& params, size_t index, - VXdoc::Output_options& oo) { -/* - -*/ - - // configuring with options from parameter... - if(params.count()>index) { - Value& voptions=params.as_no_junction(index, "options must be string"); - if(voptions.is_defined()) { - if(HashStringValue *options=voptions.get_hash()) { - // $.method[xml|html|text] - if(Value* vmethod=options->get(String::Body(XDOC_OUTPUT_METHOD_OPTION_NAME))) - oo.method=&vmethod->as_string(); - - // $.version[1.0] - param_option_over_output_option(*options, "version", oo.version); - // $.encoding[windows-1251|...] - param_option_over_output_option(*options, "encoding", oo.encoding); - // $.omit-xml-declaration[yes|no] - param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration); - // $.standalone[yes|no] - param_option_over_output_option(*options, "standalone", oo.standalone); - // $.indent[yes|no] - param_option_over_output_option(*options, "indent", oo.indent); - // $.media-type[text/{html|xml|plain}] - param_option_over_output_option(*options, "media-type", oo.mediaType); - } - } - } - - // default encoding from pool - if(!oo.encoding) - oo.encoding=new String(r.charsets.source().NAME(), String::L_TAINTED); - // default method=xml - if(!oo.method) - oo.method=new String(XDOC_OUTPUT_METHOD_OPTION_VALUE_XML); - // default mediaType = depending on method - if(!oo.mediaType) { - if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_XML) - oo.mediaType=new String("text/xml"); - else if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML) - oo.mediaType=new String("text/html"); - else // XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT & all others - oo.mediaType=new String("text/plain"); - } -} - -struct Xdoc2buf_result { - char* str; - size_t length; -}; -static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, - MethodParams& params, int index, - VXdoc::Output_options& oo, - 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* render_encoding; - const char* header_encoding; +String::C xdoc2buf(Request& r, VXdoc& vdoc, + XDocOutputOptions& oo, + const String* file_spec, + bool use_source_charset_to_render_and_client_charset_to_write_to_header=false) { + Charset* render=0; + Charset* header=0; 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(); + render=&r.charsets.source(); + header=&r.charsets.client(); } else { - header_encoding=render_encoding=oo.encoding->cstr(); + header=render=&pa_charsets.get(*oo.encoding); } + const char* render_encoding=render->NAME_CSTR(); + const char* header_encoding=header->NAME_CSTR(); xmlCharEncodingHandler *renderer=xmlFindCharEncodingHandler(render_encoding); - if(!renderer) - throw Exception(PARSER_RUNTIME, - 0, - "encoding '%s' not supported", render_encoding); // UTF-8 renderer contains empty input/output converters, // which is wrong for xmlOutputBufferCreateIO // while zero renderer goes perfectly - if(strcmp(render_encoding, "UTF-8")==0) + if(render->isUTF8()) renderer=0; xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(renderer)); - xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); - if(!stylesheet.get()) - throw Exception(0, - 0, - "xsltNewStylesheet failed"); + xsltStylesheet *stylesheet = xsltNewStylesheet(); + if(!stylesheet) + throw Exception(0, 0, "xsltNewStylesheet failed"); #define OOSTRING2STYLE(name) \ stylesheet->name=oo.name?BAD_CAST xmlMemStrdup((const char*)r.transcode(*oo.name)):0 @@ -613,12 +462,22 @@ static Xdoc2buf_result xdoc2buf(Request& xmldoc.encoding=BAD_CAST xmlMemStrdup(render_encoding); if(header_encoding) stylesheet->encoding=BAD_CAST xmlMemStrdup(header_encoding); - if(xsltSaveResultTo(outputBuffer.get(), &xmldoc, stylesheet.get())<0 + if(xsltSaveResultTo(outputBuffer.get(), &xmldoc, stylesheet)<0 || xmlHaveGenericErrors()) - throw XmlException(0); + throw XmlException(0, r); // write out result - char *gnome_str; size_t gnome_length; + char *gnome_str; + size_t gnome_length; +#ifdef LIBXML2_NEW_BUFFER + if(outputBuffer->conv) { + gnome_length=xmlBufUse(outputBuffer->conv); + gnome_str=(char *)xmlBufContent(outputBuffer->conv); + } else { + gnome_length=xmlOutputBufferGetSize(&(*outputBuffer)); + gnome_str=(char *)xmlOutputBufferGetContent(&(*outputBuffer)); + } +#else if(outputBuffer->conv) { gnome_length=outputBuffer->conv->use; gnome_str=(char *)outputBuffer->conv->content; @@ -626,64 +485,62 @@ static Xdoc2buf_result xdoc2buf(Request& gnome_length=outputBuffer->buffer->use; gnome_str=(char *)outputBuffer->buffer->content; } +#endif - 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, + if(file_spec){ + file_write(r.charsets, + *file_spec, + gnome_str, + gnome_length, true/*as_text*/); + return String::C(); // actually, we don't need this output at all + } else + return String::C(gnome_length ? pa_strdup(gnome_str, gnome_length) : 0, gnome_length); +} - return result; +inline HashStringValue* get_options(MethodParams& params, size_t index){ + return (params.count()>index) ? params.as_hash(index) : 0; } static void _file(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - VXdoc::Output_options oo(vdoc.output_options); - Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, - oo, - 0/*not to file, to memory*/); - // write out result - r.write_no_lang(String(buf.str, buf.length)); - // write out result + XDocOutputOptions oo(vdoc.output_options); + oo.append(r, get_options(params, 0), true/* $.name[filename] could be specified by user */); + String::C buf=xdoc2buf(r, vdoc, oo, 0/*file_name. not to file, to memory*/); + VFile& vfile=*new VFile; VHash& vhcontent_type=*new VHash; - vhcontent_type.hash().put( - value_name, - new VString(*oo.mediaType)); - vhcontent_type.hash().put( - String::Body("charset"), - new VString(*oo.encoding)); - - vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, - 0/*file_name*/, &vhcontent_type); - r.write_no_lang(vfile); + vhcontent_type.hash().put(value_name, new VString(*oo.mediaType)); + vhcontent_type.hash().put("charset", new VString(*oo.encoding)); + + vfile.set_binary(false/*not tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, oo.filename, &vhcontent_type); + + // write out result + r.write(vfile); } static void _save(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& file_spec=r.absolute(params.as_string(0, "file name must be string")); + const String& file_spec=r.full_disk_path(params.as_string(0, FILE_NAME_MUST_BE_STRING)); - VXdoc::Output_options oo(vdoc.output_options); - xdoc2buf(r, vdoc, params, 1, - oo, - &file_spec); + XDocOutputOptions oo(vdoc.output_options); + oo.append(r, get_options(params, 1)); + xdoc2buf(r, vdoc, oo, &file_spec); } static void _string(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - VXdoc::Output_options oo(vdoc.output_options); - Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, - oo, - 0/*not to file, to memory*/, + + XDocOutputOptions oo(vdoc.output_options); + oo.append(r, get_options(params, 0)); + String::C buf=xdoc2buf(r, vdoc, oo, + 0/*file_name. 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(String::Body(buf.str), String::L_AS_IS)); + r.write(String(buf, String::L_AS_IS)); } #ifndef DOXYGEN @@ -702,8 +559,7 @@ static void add_xslt_param( *info->current_transform_param++=(s=info->r->transcode(meaning->as_string())); *info->strings+=s; } -static VXdoc& _transform(Request& r, const String* stylesheet_source, - VXdoc& vdoc, xsltStylesheetPtr stylesheet, const xmlChar** transform_params) +static VXdoc& _transform(Request& r, const String* stylesheet_source, VXdoc& vdoc, xsltStylesheetPtr stylesheet, const xmlChar** transform_params) { xmlDoc& xmldoc=vdoc.get_xmldoc(); @@ -722,7 +578,7 @@ static VXdoc& _transform(Request& r, con 0/*FILE *profile*/, transformContext.get()); if(!transformed || xmlHaveGenericErrors()) - throw XmlException(stylesheet_source); + throw XmlException(stylesheet_source, r); //gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE type, fixing transformed->type=XML_DOCUMENT_NODE; @@ -743,7 +599,7 @@ static VXdoc& _transform(Request& r, con !indent = "yes" | "no" !media-type = string /> */ - VXdoc::Output_options& oo=result.output_options; + XDocOutputOptions& oo=result.output_options; oo.method=stylesheet->method?&r.transcode(stylesheet->method):0; oo.encoding=stylesheet->encoding?&r.transcode(stylesheet->encoding):0; @@ -762,63 +618,52 @@ static void _transform(Request& r, Metho // params Array transform_strings; const xmlChar** transform_params=0; - if(params.count()>1) { - Value& vparams=params.as_no_junction(1, "transform parameters must be hash"); - if(!vparams.is_string()) - if(HashStringValue* hash=vparams.get_hash()) { - transform_params=new(UseGC) const xmlChar*[hash->count()*2+1]; - Add_xslt_param_info info={ - &r, - &transform_strings, - transform_params - }; - hash->for_each(add_xslt_param, &info); - transform_params[hash->count()*2]=0; - } else - throw Exception(PARSER_RUNTIME, - 0, - "transform parameters parameter must be hash"); - } + if(params.count()>1) + if(HashStringValue* hash=params.as_hash(1, "transform options")) { + transform_params=new(PointerGC) const xmlChar*[hash->count()*2+1]; + Add_xslt_param_info info={ + &r, + &transform_strings, + transform_params + }; + hash->for_each(add_xslt_param, &info); + transform_params[hash->count()*2]=0; + } VXdoc* result; - if(Value *vxdoc=params[0].as(VXDOC_TYPE, false)) { // stylesheet (xdoc) - xmlDoc& stylesheetdoc=static_cast(vxdoc)->get_xmldoc(); + if(Value *vxdoc=params[0].as(VXDOC_TYPE)) { // stylesheet (xdoc) + VXdoc& vstylesheet=static_cast(*vxdoc); + xmlDoc& stylesheetdoc=vstylesheet.get_xmldoc(); + // compile xdoc stylesheet - xsltStylesheet_auto_ptr stylesheet_ptr(xsltParseStylesheetDoc(&stylesheetdoc)); + xsltStylesheet *stylesheet=xsltParseStylesheetDoc(&stylesheetdoc); if(xmlHaveGenericErrors()) - throw XmlException(0); - 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; + throw XmlException(0, r); + if(!stylesheet) + throw Exception("xml", 0, "stylesheet failed to compile"); // transform! - result=&_transform(r, 0, - vdoc, stylesheet_ptr.get(), - transform_params); + result=&_transform(r, 0, vdoc, stylesheet, transform_params); } else { // stylesheet (file name) // 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); + const String& stylesheet_filespec=r.full_disk_path(params.as_string(0, "stylesheet must be file name (string) or DOM document (xdoc)")); + 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(), - transform_params); + result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(), transform_params); } // write out result - r.write_no_lang(*result); + r.write(*result); } // constructor /// @test how to create empty type html? -MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, xnode_class) { +MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME) { + set_base(xnode_class); + /// DOM1 // Element createElement(in DOMString tagName) raises(DOMException); @@ -888,6 +733,7 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, // global variable -DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive +DECLARE_CLASS_VAR(xnode, 0); // fictive +DECLARE_CLASS_VAR(xdoc, 0); // fictive #endif