--- parser3/src/classes/xdoc.C 2003/03/27 10:04:06 1.108.2.19.2.16 +++ parser3/src/classes/xdoc.C 2004/09/13 08:12:57 1.145 @@ -1,14 +1,24 @@ /** @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) */ -#include "classes.h" +#include "pa_config_includes.h" + #ifdef XML -static const char* IDENT_XDOC_C="$Date: 2003/03/27 10:04:06 $"; +static const char * const IDENT_XDOC_C="$Date: 2004/09/13 08:12:57 $"; + +#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" @@ -17,19 +27,9 @@ static const char* IDENT_XDOC_C="$Date: #include "pa_vxdoc.h" #include "pa_charset.h" #include "pa_vfile.h" +#include "pa_xml_exception.h" #include "xnode.h" -#include "gdome.h" -#include "libxml/tree.h" -extern "C" { -#include "gdomecore/gdome-xml-node.h" -#include "gdomecore/gdome-xml-document.h" -}; -#include "libxslt/xsltInternals.h" -#include "libxslt/transform.h" -#include "libxslt/xsltutils.h" -#include "libxslt/variables.h" - // defines #define XDOC_CLASS_NAME "xdoc" @@ -43,13 +43,11 @@ extern "C" { 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 @@ -159,31 +157,48 @@ private: // methods -static void writeNode(Request& r, GdomeNode *node, +static void writeNode(Request& r, VXdoc& xdoc, GdomeNode *node, GdomeException exc) { if(!node || exc) - throw Exception(0, 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); -static void _createElement(Request& r, MethodParams* params) { +static void _createElement(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& tagName=params->as_string(0, "tagName must be string"); + const String& tagName=params.as_string(0, "tagName must be string"); GdomeException exc; GdomeNode *node= (GdomeNode *)gdome_doc_createElement(vdoc.get_document(), - r.transcode(tagName).get(), + r.transcode(tagName).use(), + &exc); + writeNode(r, vdoc, node, exc); +} + +// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); +static void _createElementNS(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + // namespaceURI;localName + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& qualifiedName=params.as_string(1, "qualifiedName must be string"); + + GdomeException exc; + GdomeNode *node= + (GdomeNode *)gdome_doc_createElementNS(vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(qualifiedName).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, MethodParams* ) { +static void _createDocumentFragment(Request& r, MethodParams&) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeException exc; @@ -191,242 +206,267 @@ 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); -static void _createTextNode(Request& r, MethodParams* params) { +static void _createTextNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createTextNode( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // Comment createComment(in DOMString data) -static void _createComment(Request& r, MethodParams* params) { +static void _createComment(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createComment( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // CDATASection createCDATASection(in DOMString data) raises(DOMException); -static void _createCDATASection(Request& r, MethodParams* params) { +static void _createCDATASection(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createCDATASection( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); -static void _createProcessingInstruction(Request& r, MethodParams* params) { +static void _createProcessingInstruction(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& target=params->as_string(0, "data must be string"); - const String& data=params->as_string(1, "data must be string"); + const String& target=params.as_string(0, "data must be string"); + const String& data=params.as_string(1, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createProcessingInstruction( vdoc.get_document(), - r.transcode(target).get(), - r.transcode(data).get(), + 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); -static void _createAttribute(Request& r, MethodParams* params) { +static void _createAttribute(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createAttribute( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } + +// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); +static void _createAttributeNS(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + // namespaceURI;qualifiedName + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& qualifiedName=params.as_string(1, "name must be string"); + + GdomeException exc; + GdomeNode *node=(GdomeNode *)gdome_doc_createAttributeNS( + vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(qualifiedName).use(), + &exc); + writeNode(r, vdoc, node, exc); +} + // EntityReference createEntityReference(in DOMString name) raises(DOMException); -static void _createEntityReference(Request& r, MethodParams* params) { +static void _createEntityReference(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createEntityReference( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc); - writeNode(r, node, exc); + writeNode(r, vdoc, node, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, MethodParams* params) { +static void _getElementsByTagName(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); VHash& result=*new VHash; GdomeException exc; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagName( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ias_string(0, "namespaceURI must be string"); - const String& localName=params->as_string(1, "localName must be string"); + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& localName=params.as_string(1, "localName must be string"); GdomeException exc; VHash& result=*new VHash; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagNameNS( vdoc.get_document(), - r.transcode(namespaceURI).get(), - r.transcode(localName).get(), + r.transcode(namespaceURI).use(), + r.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ias_string(0, "elementID must be string"); + const String& elementId=params.as_string(0, "elementID must be string"); GdomeException exc; if(GdomeNode *node=(GdomeNode *)gdome_doc_getElementById( vdoc.get_document(), - r.transcode(elementId).get(), + r.transcode(elementId).use(), &exc)) { // write out result - r.write_no_lang(*new VXnode(&r.charsets, node)); + r.write_no_lang(*new VXnode(&r.charsets, vdoc, node)); } else if(exc || xmlHaveGenericErrors()) - throw Exception( - &elementId, - exc); + throw XmlException(&elementId, exc); } -static void _importNode(Request& r, MethodParams* params) { +static void _importNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeNode *importedNode= as_node(params, 0, "importedNode must be node"); bool deep= - params->as_bool(1, "deep must be bool", r); + params.as_bool(1, "deep must be bool", r); GdomeException exc; GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(), 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)); + r.write_no_lang(*new VXnode(&r.charsets, vdoc, outputNode)); } /* GdomeElement *gdome_doc_createElementNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc); GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc); */ -static void _create(Request& r, MethodParams* params) { +static void _create(Request& r, MethodParams& params) { Charset& source_charset=r.charsets.source(); VXdoc& vdoc=GET_SELF(r, VXdoc); - Value& param=*(*params)[params->count()-1]; + Value& param=params[params.count()-1]; GdomeDocument *document; + bool set_encoding=false; if(param.get_junction()) { // {...} 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) )); + //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} } else { // [name] 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); - */ - document=gdome_di_createDocument (domimpl, + /// +xalan createXMLDecl ? +#endif + document=gdome_di_createDocument(domimpl, 0/*namespaceURI*/, - r.transcode(qualifiedName).get(), + r.transcode(qualifiedName).use(), 0/*doctype*/, &exc); if(!document || exc || xmlHaveGenericErrors()) - throw Exception(0, exc); - - xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); - const char* source_charset_name=source_charset.name().cstr(); - doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name)); + throw XmlException(0, exc); - /// +xalan createXMLDecl ? + set_encoding=true; + // must be last action in if, see after if} + } + // must be first action after if} + // replace any previous parsed source + { + vdoc.set_document(&r.charsets, document); + GdomeException exc; + gdome_doc_unref(document, &exc); } // URI const char* URI_cstr; const char* URI_cstr_ptr; - if(params->count()>1) { // absolute(param) - const String& URI=params->as_string(0, "URI must be string"); + if(params.count()>1) { // absolute(param) + const String& URI=params.as_string(0, "URI must be string"); URI_cstr=URI_cstr_ptr=r.absolute(URI).cstr(); } else // default = disk path to requested document URI_cstr=r.request_info.path_translated; @@ -434,53 +474,60 @@ static void _create(Request& r, MethodPa if(URI_cstr) doc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - // replace any previous parsed source - vdoc.set_document(&r.charsets, document); + if(set_encoding) { + const char* source_charset_name=source_charset.NAME().cstr(); + doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name)); + } } -static void _load(Request& r, MethodParams* params) { - Charset& source_charset=r.charsets.source(); +static void _load(Request& r, MethodParams& params) { 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(source_charset, uri, false/*not text*/, - params->count()>1?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); } - const char* URI_cstr=uri.cstr(); + // must be first action after if} + // replace any previous parsed source + { + vdoc.set_document(&r.charsets, document); + GdomeException exc; + gdome_doc_unref(document, &exc); + } +/* 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=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - - // replace any previous parsed source - vdoc.set_document(&r.charsets, document); + doc->URL=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); +*/ } static void param_option_over_output_option( HashStringValue& param_options, const char* option_name, const String*& output_option) { - if(Value* value=param_options.get(StringBody(option_name))) + 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, - bool& output_option) { - if(Value* value=param_options.get(StringBody(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=true; + output_option=1; else if(s=="no") - output_option=false; + output_option=0; else throw Exception("parser.runtime", &s, @@ -490,7 +537,7 @@ static void param_option_over_output_opt /// @test valid_options check static void prepare_output_options(Request& r, - MethodParams* params, size_t index, + MethodParams& params, size_t index, VXdoc::Output_options& oo) { /* count()>index) { - Value& voptions=params->as_no_junction(index, "options must be string"); + 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(StringBody(XDOC_OUTPUT_METHOD_OPTION_NAME))) + if(Value* vmethod=options->get(String::Body(XDOC_OUTPUT_METHOD_OPTION_NAME))) oo.method=&vmethod->as_string(); // $.version[1.0] @@ -523,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}] @@ -537,7 +580,7 @@ static void prepare_output_options(Reque // default encoding from pool if(!oo.encoding) - oo.encoding=&r.charsets.source().name(); + 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); @@ -557,26 +600,35 @@ struct Xdoc2buf_result { size_t length; }; static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, - MethodParams* params, int index, + 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()) @@ -584,25 +636,29 @@ static Xdoc2buf_result xdoc2buf(Request& 0, "xsltNewStylesheet failed"); - #define OOS2STYLE(name) \ - stylesheet->name=oo.name?BAD_CAST g_strdup(r.transcode(*oo.name)->str):0 - #define OOE2STYLE(name) \ - stylesheet->name=oo.name - - OOS2STYLE(method); - OOS2STYLE(encoding); - OOS2STYLE(mediaType); - OOS2STYLE(doctypeSystem); - OOS2STYLE(doctypePublic); - OOE2STYLE(indent); - OOS2STYLE(version); - OOE2STYLE(standalone); - OOE2STYLE(omitXmlDeclaration); + #define OOSTRING2STYLE(name) \ + stylesheet->name=oo.name?BAD_CAST xmlMemStrdup(r.transcode(*oo.name)->str):0 + #define OOBOOL2STYLE(name) \ + if(oo.name>=0) stylesheet->name=oo.name + + 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 @@ -614,19 +670,21 @@ static Xdoc2buf_result xdoc2buf(Request& gnome_length=outputBuffer->buffer->use; 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; } -static void _file(Request& r, MethodParams* params) { +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, @@ -642,7 +700,7 @@ static void _file(Request& r, MethodPara value_name, new VString(*oo.mediaType)); vhcontent_type.hash().put( - StringBody("charset"), + String::Body("charset"), new VString(*oo.encoding)); vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, @@ -650,10 +708,10 @@ static void _file(Request& r, MethodPara r.write_no_lang(vfile); } -static void _save(Request& r, MethodParams* params) { +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.absolute(params.as_string(0, "file name must be string")); VXdoc::Output_options oo(vdoc.output_options); xdoc2buf(r, vdoc, params, 1, @@ -661,14 +719,15 @@ static void _save(Request& r, MethodPara &file_spec); } -static void _string(Request& r, MethodParams* params) { +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*/); + 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 @@ -686,13 +745,15 @@ 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)); // make params literal - if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext + if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext transformContext->globalVars = xmlHashCreate(20); xsltQuoteUserParams(transformContext.get(), transform_params); // do transform @@ -705,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 @@ -737,34 +798,32 @@ 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; } -static void _transform(Request& r, MethodParams* params) { +static void _transform(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); // params Array transform_strings; const char** transform_params=0; - if(params->count()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters must be hash"); + if(params.count()>1) { + Value& vparams=params.as_no_junction(1, "transform parameters must be hash"); if(!vparams.is_string()) - if(HashStringValue* params=vparams.get_hash()) { - transform_params=new(UseGC) const char*[params->count()*2+1]; + if(HashStringValue* hash=vparams.get_hash()) { + transform_params=new(UseGC) const char*[hash->count()*2+1]; Add_xslt_param_info info={ &r, &transform_strings, transform_params }; - params->for_each(add_xslt_param, &info); - transform_params[params->count()*2]=0; + hash->for_each(add_xslt_param, &info); + transform_params[hash->count()*2]=0; } else throw Exception("parser.runtime", 0, @@ -772,23 +831,22 @@ static void _transform(Request& r, Metho } VXdoc* result; - Value* vmaybe_xdoc=(*params)[0]; - if(Value *vxdoc=vmaybe_xdoc->as(VXDOC_TYPE, false)) { // stylesheet (xdoc) + if(Value *vxdoc=params[0].as(VXDOC_TYPE, false)) { // stylesheet (xdoc) xmlDoc *document=gdome_xml_doc_get_xmlDoc( 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, @@ -797,13 +855,12 @@ static void _transform(Request& r, Metho } 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); + 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); // 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); } @@ -844,6 +901,12 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, // Node (in Node importedNode, in boolean deep) raises(DOMException) add_native_method("importNode", Method::CT_DYNAMIC, _importNode, 2, 2); + // Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); + add_native_method("createAttributeNS", Method::CT_DYNAMIC, _createAttributeNS, 2, 2); + + // Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); + add_native_method("createElementNS", Method::CT_DYNAMIC, _createElementNS, 2, 2); + // NodeList getElementsByTagNameNS(in DOMString namespaceURI, in DOMString localName); add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2); @@ -857,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] @@ -877,14 +940,12 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, } -void MXdoc::configure_admin(Request& r) { -} - # else +#include "classes.h" + // global variable DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive #endif -