--- parser3/src/classes/xdoc.C 2002/01/14 17:48:56 1.59 +++ parser3/src/classes/xdoc.C 2004/02/17 15:08:14 1.136 @@ -1,28 +1,35 @@ /** @file Parser: @b xdoc parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: xdoc.C,v 1.59 2002/01/14 17:48:56 paf Exp $ + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -#include "pa_types.h" + +#include "pa_config_includes.h" + #ifdef XML -#include "pa_stylesheet_connection.h" -#include "classes.h" +static const char * const IDENT_XDOC_C="$Date: 2004/02/17 15:08:14 $"; + +#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" + +#include "pa_stylesheet_manager.h" #include "pa_request.h" #include "pa_vxdoc.h" #include "pa_charset.h" #include "pa_vfile.h" +#include "pa_xml_exception.h" #include "xnode.h" -extern "C" { -#include "gdomecore/gdome-xml-node.h" -#include "gdomecore/gdome-xml-document.h" -}; -#include "libxslt/transform.h" - // defines #define XDOC_CLASS_NAME "xdoc" @@ -31,375 +38,507 @@ extern "C" { #define XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "xml" #define XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "html" #define XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "text" -#define XDOC_OUTPUT_DEFAULT_INDENT 4 // class -class MXdoc : public MXnode { +class MXdoc: public MXnode { public: // VStateless_class - Value *create_new_value(Pool& pool) { return new(pool) VXdoc(pool, 0); } + Value* create_new_value(Pool&) { return new VXdoc(0, 0); } + +public: + MXdoc(); + +}; + +// global variable + +DECLARE_CLASS_VAR(xdoc, new MXdoc, 0); + +// helper classes +class xmlOutputBuffer_auto_ptr { public: - MXdoc(Pool& pool); + explicit xmlOutputBuffer_auto_ptr(xmlOutputBuffer *_APtr = 0) + : _Owns(_APtr != 0), _Ptr(_APtr) {} + xmlOutputBuffer_auto_ptr(const xmlOutputBuffer_auto_ptr& _Y) + : _Owns(_Y._Owns), _Ptr(_Y.release()) {} + xmlOutputBuffer_auto_ptr& operator=(const xmlOutputBuffer_auto_ptr& _Y) + {if (this != &_Y) + {if (_Ptr != _Y.get()) + {if (_Owns && _Ptr) + xmlOutputBufferClose(_Ptr); + _Owns = _Y._Owns; } + else if (_Y._Owns) + _Owns = true; + _Ptr = _Y.release(); } + return (*this); } + ~xmlOutputBuffer_auto_ptr() + {if (_Owns && _Ptr) + xmlOutputBufferClose(_Ptr); } + xmlOutputBuffer& operator*() const + {return (*get()); } + xmlOutputBuffer *operator->() const + {return (get()); } + xmlOutputBuffer *get() const + {return (_Ptr); } + xmlOutputBuffer *release() const + {((xmlOutputBuffer_auto_ptr *)this)->_Owns = false; + return (_Ptr); } +private: + bool _Owns; + xmlOutputBuffer *_Ptr; +}; -public: // Methoded - bool used_directly() { return true; } - void configure_admin(Request& r); +class xsltTransformContext_auto_ptr { +public: + explicit xsltTransformContext_auto_ptr(xsltTransformContext *_APtr = 0) + : _Owns(_APtr != 0), _Ptr(_APtr) {} + xsltTransformContext_auto_ptr(const xsltTransformContext_auto_ptr& _Y) + : _Owns(_Y._Owns), _Ptr(_Y.release()) {} + xsltTransformContext_auto_ptr& operator=(const xsltTransformContext_auto_ptr& _Y) + {if (this != &_Y) + {if (_Ptr != _Y.get()) + {if (_Owns && _Ptr) + xsltFreeTransformContext(_Ptr); + _Owns = _Y._Owns; } + else if (_Y._Owns) + _Owns = true; + _Ptr = _Y.release(); } + return (*this); } + ~xsltTransformContext_auto_ptr() + {if (_Owns && _Ptr) + xsltFreeTransformContext(_Ptr); } + xsltTransformContext& operator*() const + {return (*get()); } + xsltTransformContext *operator->() const + {return (get()); } + xsltTransformContext *get() const + {return (_Ptr); } + xsltTransformContext *release() const + {((xsltTransformContext_auto_ptr *)this)->_Owns = false; + return (_Ptr); } +private: + bool _Owns; + 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, const String& method_name, GdomeNode *node, +static void writeNode(Request& r, GdomeNode *node, GdomeException exc) { if(!node || exc) - throw Exception(0, 0, - &method_name, - exc); - - Pool& pool=r.pool(); + throw XmlException(0, exc); // write out result - VXnode& result=*new(pool) VXnode(pool, node); - r.write_no_lang(result); + r.write_no_lang(*new VXnode(&r.charsets, node)); } // Element createElement(in DOMString tagName) raises(DOMException); -static void _createElement(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(tagName).get(), + (GdomeNode *)gdome_doc_createElement(vdoc.get_document(), + r.transcode(tagName).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, 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); } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +static void _createDocumentFragment(Request& r, MethodParams&) { + VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeException exc; GdomeNode *node= (GdomeNode *)gdome_doc_createDocumentFragment( - vdoc.get_document(&method_name), + vdoc.get_document(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Text createTextNode(in DOMString data); -static void _createTextNode(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Comment createComment(in DOMString data) -static void _createComment(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // CDATASection createCDATASection(in DOMString data) raises(DOMException); -static void _createCDATASection(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); -static void _createProcessingInstruction(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(target).get(), - pool.transcode(data).get(), + vdoc.get_document(), + r.transcode(target).use(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Attr createAttribute(in DOMString name) raises(DOMException); -static void _createAttribute(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(name).get(), + vdoc.get_document(), + r.transcode(name).use(), + &exc); + writeNode(r, 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, method_name, node, exc); + writeNode(r, node, exc); } + // EntityReference createEntityReference(in DOMString name) raises(DOMException); -static void _createEntityReference(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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(&method_name), - pool.transcode(name).get(), + vdoc.get_document(), + r.transcode(name).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } -static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +// NodeList getElementsByTagName(in DOMString name); +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; - VHash& result=*new(pool) VHash(pool); if(GdomeNodeList *nodes= gdome_doc_getElementsByTagName( - vdoc.get_document(&method_name), - pool.transcode(name).get(), + vdoc.get_document(), + r.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; i(r.self); +static void _getElementsByTagNameNS(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& localName=params->as_string(0, "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(pool) VHash(pool); + VHash& result=*new VHash; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagNameNS( - vdoc.get_document(&method_name), - pool.transcode(namespaceURI).get(), - pool.transcode(localName).get(), + vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; i(r.self); +static void _getElementById(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); // elementId - const String& elementId=params->as_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(&method_name), - pool.transcode(elementId).get(), + vdoc.get_document(), + r.transcode(elementId).use(), &exc)) { // write out result - VXnode& result=*new(pool) VXnode(pool, node); - r.write_no_lang(result); - } else if(exc) - throw Exception(0, 0, - &method_name, - exc); + r.write_no_lang(*new VXnode(&r.charsets, node)); + } else if(exc || xmlHaveGenericErrors()) + throw XmlException(&elementId, exc); } -/* -GdomeNode *gdome_doc_importNode (GdomeDocument *self, GdomeNode *importedNode, GdomeBoolean deep, GdomeException *exc); -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, const String& method_name, MethodParams *params) { - //_asm int 3; - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - const String& qualifiedName=params->as_string(0, "qualifiedName must be string"); +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); GdomeException exc; - /* - GdomeDocumentType *documentType=gdome_di_createDocumentType ( - docimpl, - pool.transcode(qualifiedName), - 0/*publicId* /, - 0/*systemId* /, - &exc); - if(!documentType || exc) - throw Exception(0, 0, - &method_name, - exc); - */ - GdomeDocument *document=gdome_di_createDocument (domimpl, - 0/*namespaceURI*/, - pool.transcode(qualifiedName).get(), - 0/*doctype*/, - &exc); - if(!document || exc) - throw Exception(0, 0, - &method_name, - exc); - - /// +xalan createXMLDecl ? + GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(), + importedNode, + deep, &exc); + if(exc) + throw XmlException(0, exc); - // replace any previous parsed source - vdoc.set_document(document); + // write out result + r.write_no_lang(*new VXnode(&r.charsets, 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); +*/ -/// @test xmlSAXParseMemory(NULL<(r.self); - - Value& vxml=params->as_junction(0, "xml must be code"); - Temp_lang temp_lang(r, String::UL_XML); - const String& xml=r.process(vxml).as_string(); +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]; + 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, 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 XmlException(0, exc); + } - GdomeException exc; - GdomeDocument *document=gdome_di_createDocFromMemory(domimpl, - xml.cstr(String::UL_UNSPECIFIED, r.connection), - GDOME_LOAD_PARSING - /* GDOME_LOAD_VALIDATING */ - /*|GDOME_LOAD_SUBSTITUTE_ENTITIES */, - &exc); - if(!document || exc) - throw Exception(0, 0, - &method_name, - 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*/, + &exc); + if(!documentType || exc || xmlHaveGenericErrors()) + throw Exception( + method_name, + exc); + /// +xalan createXMLDecl ? +#endif + document=gdome_di_createDocument(domimpl, + 0/*namespaceURI*/, + r.transcode(qualifiedName).use(), + 0/*doctype*/, + &exc); + if(!document || exc || xmlHaveGenericErrors()) + throw XmlException(0, exc); + 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(document); + { + 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"); + URI_cstr=URI_cstr_ptr=r.absolute(URI).cstr(); + } else // default = disk path to requested document + URI_cstr=r.request_info.path_translated; + xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); + if(URI_cstr) + doc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); + + 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, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +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); - - GdomeException exc; - GdomeDocument *document=gdome_di_createDocFromURI(domimpl, - uri.cstr(), - GDOME_LOAD_PARSING - /*GDOME_LOAD_VALIDATING */ - /*|GDOME_LOAD_SUBSTITUTE_ENTITIES */, - &exc); - if(!document || exc) - throw Exception(0, 0, - &method_name, - exc); - + 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 *)xmlParseFile(uri_cstr)); + if(!document || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw XmlException(uri, exc); + } + // must be first action after if} // replace any previous parsed source - vdoc.set_document(document); -} - -/* -static void param_option_over_output_option(Pool& pool, - Hash *param_options, const char *option_name, - XalanDOMString& output_option) { - if(Value *value=static_cast(param_options->get(*new(pool) - String(pool, option_name)))) { - output_option.clear(); - output_option.append(value->as_string().cstr()); + { + 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=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); +*/ } -static void param_option_over_output_option(Pool& pool, - Hash *param_options, const char *option_name, - bool& output_option) { - if(Value *value=static_cast(param_options->get(*new(pool) - String(pool, option_name)))) { + +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, + bool& output_option) { + if(Value* value=param_options.get(String::Body(option_name))) { const String& s=value->as_string(); if(s=="yes") output_option=true; else if(s=="no") output_option=false; else - throw Exception(0, 0, + throw Exception("parser.runtime", &s, "%s must be either 'yes' or 'no'", option_name); } } - static std::auto_ptr create_optioned_listener( - Pool& pool, const String& method_name, MethodParams *params, int index, - VXdoc::Output_options& oo, Writer& writer) { -/* - XalanDOMString encoding; - XalanDOMString mediaType; - XalanDOMString doctypeSystem; - XalanDOMString doctypePublic; - bool doIndent; - XalanDOMString version; - XalanDOMString standalone; - bool xmlDecl; -* / - +/// @test valid_options check +static void prepare_output_options(Request& r, + MethodParams& params, size_t index, + VXdoc::Output_options& oo) { /* -* / - - /* - fToXML->setStripCData(stripCData); - fToXML->setEscapeCData(escapeCData); - * / +*/ // configuring with options from parameter... - if(params->size()>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(Hash *options=voptions.get_hash(&method_name)) { + if(HashStringValue *options=voptions.get_hash()) { // $.method[xml|html|text] - if(Value *vmethod=static_cast(options->get(*new(pool) - String(pool, XDOC_OUTPUT_METHOD_OPTION_NAME)))) - oo.method=vmethod->as_string().cstr(); + 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(pool, options, "version", oo.version); + param_option_over_output_option(*options, "version", oo.version); // $.encoding[windows-1251|...] - param_option_over_output_option(pool, options, "encoding", oo.encoding); + param_option_over_output_option(*options, "encoding", oo.encoding); // $.omit-xml-declaration[yes|no] - bool omit_xml_declaration=!oo.xmlDecl; - param_option_over_output_option(pool, options, "omit-xml-declaration", omit_xml_declaration); - oo.xmlDecl=!omit_xml_declaration; + param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration); // $.standalone[yes|no] - param_option_over_output_option(pool, options, "standalone", oo.standalone); - // $.doctype-public[?] - param_option_over_output_option(pool, options, "doctype-public", oo.doctypePublic); - // $.doctype-system[?] - param_option_over_output_option(pool, options, "doctype-system", oo.doctypeSystem); + param_option_over_output_option(*options, "standalone", oo.standalone); // $.indent[yes|no] - param_option_over_output_option(pool, options, "indent", oo.doIndent); + param_option_over_output_option(*options, "indent", oo.indent); // $.media-type[text/{html|xml|plain}] - param_option_over_output_option(pool, options, "media-type", oo.mediaType); + param_option_over_output_option(*options, "media-type", oo.mediaType); } } } // default encoding from pool - if(oo.encoding.empty()) - oo.encoding.append(pool.get_source_charset().name().cstr()); + if(!oo.encoding) + oo.encoding=new String(r.charsets.source().NAME(), String::L_TAINTED); // default method=xml if(!oo.method) - oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML; + 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"); + } +} + +/// patching piece from libxslt not to set meta encoding +static void +pa_xsltSaveResultToMem( + xmlChar*& doc_txt_ptr, int& doc_txt_len, + xmlDocPtr result, + xsltStylesheetPtr style, + xmlCharEncodingHandler* encoder) +{ + const xmlChar *encoding; + int base; + const xmlChar *method; + int indent; + xmlOutputBufferPtr buf = 0; + + if ((result == NULL) || (style == NULL)) + return; + if ((result->children == NULL) || + ((result->children->type == XML_DTD_NODE) && + (result->children->next == NULL))) + return; + + if ((style->methodURI != NULL) && + ((style->method == NULL) || + (!xmlStrEqual(style->method, (const xmlChar *) "xhtml")))) { + xsltGenericError(xsltGenericErrorContext, + "xsltSaveResultTo : unknown ouput method\n"); + return; + } + + 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 = (const xmlChar *) "html"; + + if ((method != NULL) && + (xmlStrEqual(method, (const xmlChar *) "html") + ||xmlStrEqual(method, (const xmlChar *) "xhtml"))) { + if (indent == -1) + indent = 1; + // + // * xmlDocDumpFormatMemoryEnc: + // Note it is up to the caller of this function to free the + // allocated memory with xmlFree() + // + // we wont free anything, and wont copy that data anymore [already done inside and zeroterminated] + xmlDocDumpFormatMemoryEnc(result, &doc_txt_ptr, &doc_txt_len, (const char *) encoding, + indent); + } else if ((method != NULL) && + (xmlStrEqual(method, (const xmlChar *) "text"))) { + xmlNodePtr cur; + buf = xmlAllocOutputBuffer(encoder); + + 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); + } + } else { + int omitXmlDecl; + int standalone; + buf = xmlAllocOutputBuffer(encoder); + + XSLT_GET_IMPORT_INT(omitXmlDecl, style, omitXmlDeclaration); + XSLT_GET_IMPORT_INT(standalone, style, standalone); + + if (omitXmlDecl != 1) { + xmlOutputBufferWriteString(buf, "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; - if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_XML)==0) { - if(oo.mediaType.empty()) - oo.mediaType.append("text/xml"); - return std::auto_ptr(new FormatterToXML(writer, - oo.version, - oo.doIndent, - XDOC_OUTPUT_DEFAULT_INDENT, // indent - oo.encoding, - oo.mediaType, - oo.doctypeSystem, - oo.doctypePublic, - oo.xmlDecl, - oo.standalone - )); - } else if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML)==0) { - if(oo.mediaType.empty()) - oo.mediaType.append("text/html"); - return std::auto_ptr(new FormatterToHTML(writer, - oo.encoding, - oo.mediaType, - oo.doctypeSystem, - oo.doctypePublic, - oo.doIndent, - XDOC_OUTPUT_DEFAULT_INDENT, // indent - oo.version, - oo.standalone, - oo.xmlDecl - )); - } else if(strcmp(oo.method, XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT)==0) { - if(oo.mediaType.empty()) - oo.mediaType.append("text/plain"); - return std::auto_ptr(new FormatterToText(writer, - oo.encoding - )); - } else - throw Exception(0, 0, - &method_name, - XDOC_OUTPUT_METHOD_OPTION_NAME " option is invalid; valid methods are: " - "'" XDOC_OUTPUT_METHOD_OPTION_VALUE_XML "', " - "'" XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "', " - "'" XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "'"); + 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"); + } + } - // never reached -} -*/ + if(buf) { + xmlOutputBufferFlush(buf); + if(buf->conv) { + doc_txt_len=buf->conv->use; + doc_txt_ptr=buf->conv->content; + } else { + doc_txt_len=buf->buffer->use; + doc_txt_ptr=buf->buffer->content; + } -static void _save(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); + if(doc_txt_ptr && doc_txt_len) + doc_txt_ptr=BAD_CAST pa_strdup((const char*)doc_txt_ptr, doc_txt_len); - const String& file_name=params->as_string(0, "file name must be string"); - const String& filespec=r.absolute(file_name); - - GdomeException exc; - if(!gdome_di_saveDocToFile(domimpl, - vdoc.get_document(&method_name), - filespec.cstr(String::UL_FILE_SPEC), - GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */, - &exc)) - throw Exception(0, 0, - &method_name, - exc); -} - -static void _string(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - char *mem; - GdomeException exc; - if(!gdome_di_saveDocToMemory(domimpl, - vdoc.get_document(&method_name), - &mem, - GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */, - &exc)) - throw Exception(0, 0, - &method_name, - exc); - - // move to pool memory - size_t buf_size=strlen(mem); - char *buf=(char *)pool.malloc(buf_size); - memcpy(buf, mem, buf_size); - g_free(mem); - // write out result - r.write_no_lang(*new(pool) String(pool, buf, buf_size)); + xmlOutputBufferClose(buf); + } } -/// @test remove text/xml const. (r.self); - - char *mem; - GdomeException exc; - if(!gdome_di_saveDocToMemory(domimpl, - vdoc.get_document(&method_name), - &mem, - GDOME_SAVE_LIBXML_INDENT /*GDOME_SAVE_STANDARD */, - &exc)) - throw Exception(0, 0, - &method_name, - exc); - - // move to pool memory - size_t buf_size=strlen(mem); - char *buf=(char *)pool.malloc(buf_size); - memcpy(buf, mem, buf_size); - g_free(mem); +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) { + Xdoc2buf_result result; + prepare_output_options(r, params, index, + oo); + + const char* encoding_cstr=oo.encoding->cstr(); + xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr); + if(!encoder) + throw Exception("parser.runtime", + 0, + "encoding '%s' not supported", encoding_cstr); + // UTF-8 encoder contains empty input/output converters, + // which is wrong for xmlOutputBufferCreateIO + // while zero encoder goes perfectly + const char* encoder_name=encoder->name; + if(strcmp(encoder_name, "UTF-8")==0) + encoder=0; + + xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); + if(!stylesheet.get()) + throw Exception(0, + 0, + "xsltNewStylesheet failed"); + + #define OOS2STYLE(name) \ + stylesheet->name=oo.name?BAD_CAST xmlMemStrdup(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); + + xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document()); + document->encoding=BAD_CAST xmlMemStrdup(encoder_name); + + xmlChar* doc_txt_ptr=0; + int doc_txt_len=0; + pa_xsltSaveResultToMem(doc_txt_ptr, doc_txt_len, document, stylesheet.get(), encoder); + if(xmlHaveGenericErrors()) { + GdomeException exc=0; + throw XmlException(0, exc); + } + + result.length=doc_txt_len; + result.str=(char*)doc_txt_ptr; + if(file_spec) + file_write(*file_spec, + result.str, result.length, + true/*as_text*/); + + return result; +} + +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 - VFile& vfile=*new(pool) VFile(pool); - const String& scontent_type=*new(pool) String(pool, "text/xml"); - Value *vcontent_type=new(pool) VString(scontent_type); - VHash *vhcontent_type=new(pool) VHash(pool); - vhcontent_type->hash(&method_name).put(*value_name, new(pool) VString(scontent_type)); - const String& scharset=pool.get_source_charset().name(); - vhcontent_type->hash(&method_name).put(*new(pool) String(pool, "charset"), new(pool) VString(scharset)); - vcontent_type=vhcontent_type; - - vfile.set(false/*tainted*/, buf, buf_size, 0/*file_name*/, vcontent_type); + r.write_no_lang(String(buf.str, buf.length)); + + // write out result + 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); } -/// @test lang=String::UL_UNSPECIFIED? -static void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, - void *info) { - Value *meaning=static_cast(ameaning); - Pool& pool=meaning->pool(); - const char **transform_params=(const char **)info; - *transform_params++=pool.transcode(aattribute)->str; - *transform_params++=pool.transcode(meaning->as_string())->str; -} -static void _transform(Request& r, const String& method_name, MethodParams *params) { - //_asm int 3; - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); +static void _save(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); - // params - const char **transform_params=0; - if(params->size()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters must be hash"); - if(vparams.is_defined()) - if(Hash *params=vparams.get_hash(&method_name)) { - transform_params= - (const char **)pool.malloc(sizeof(const char *)*params->size()*2+1); - params->for_each(add_xslt_param, transform_params); - transform_params[params->size()*2]=0; - } else - throw Exception(0, 0, - &method_name, - "transform parameters parameter must be hash"); - } + 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, + 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*/); + // write out result + r.write_no_lang(String(buf.str, buf.length)); +} - // stylesheet - const String& stylesheet_filespec=r.absolute(params->as_string(0, "file name must be string")); - Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec); - - // transform - xsltStylesheet *stylesheet=connection.stylesheet(false/*nocache*/); - xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n; - xsltTransformContext *transformContext=xsltNewTransformContext(stylesheet, document); +#ifndef DOXYGEN +struct Add_xslt_param_info { + Request* r; + Array* strings; + const char** current_transform_param; +}; +#endif +static void add_xslt_param( + HashStringValue::key_type attribute, + HashStringValue::value_type meaning, + Add_xslt_param_info* info) { + GdomeDOMString_auto_ptr s; + *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) +{ + 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 + transformContext->globalVars = xmlHashCreate(20); + xsltQuoteUserParams(transformContext.get(), transform_params); + // do transform xmlDoc *transformed=xsltApplyStylesheetUser( stylesheet, document, - transform_params, - 0/*const char *output*/, + 0/*already quoted-inserted transform_params*/, + 0/*const char* output*/, 0/*FILE *profile*/, - transformContext); - if(!transformed) { - // close - connection.close(); - throw Exception(0, 0, - &method_name, - "transform failed. TODO: show errors"); + transformContext.get()); + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw XmlException(stylesheet_source, exc); } - //gdome_xml_doc_mkref: invalid node type - transformed->type=XML_DOCUMENT_NODE; //XML_HTML_DOCUMENT_NODE actuall + //gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE type, fixing + transformed->type=XML_DOCUMENT_NODE; // constructing result GdomeDocument *gdomeDocument=gdome_xml_doc_mkref(transformed); if(!gdomeDocument) - throw Exception(0, 0, - &method_name, + throw Exception(0, + 0, "gdome_xml_doc_mkref failed"); - VXdoc& result=*new(pool) VXdoc(pool, gdomeDocument); - // grabbing options - /* - + VXdoc& result=*new VXdoc(&r.charsets, gdomeDocument); + /* grabbing options + + */ - memset(&result.output_options, 0, sizeof(result.output_options)); VXdoc::Output_options& oo=result.output_options; - oo.encoding=&pool.transcode(stylesheet->encoding); - oo.mediaType=&pool.transcode(stylesheet->mediaType); - oo.doctypeSystem=&pool.transcode(stylesheet->doctypeSystem); - oo.doctypePublic=&pool.transcode(stylesheet->doctypePublic); + 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.indent=stylesheet->indent!=0; - oo.version=&pool.transcode(stylesheet->version); + oo.version=stylesheet->version?&r.transcode(stylesheet->version):0; oo.standalone=stylesheet->standalone!=0; oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; - xsltFreeTransformContext(transformContext); - // close - connection.close(); - - // exceptions now allowed - - // check method - if(oo.method && ( - *oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML - || *oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML - || *oo.method!=XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT)) - throw Exception(0, 0, - &method_name, - "unsupported output method specified"); + // return + return result; +} +static void _transform(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); - // write out result - r.write_no_lang(result); + // 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(!vparams.is_string()) + 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 + }; + 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"); + } + VXdoc* result; + 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)); + if(xmlHaveGenericErrors()) { + GdomeException exc=0; + 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, + vdoc, stylesheet_ptr.get(), + 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); + + // load and compile file to stylesheet [or get cached if any] + // transform! + result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(), + transform_params); + } + + // write out result + r.write_no_lang(*result); } // constructor -MXdoc::MXdoc(Pool& apool) : MXnode(apool) { - set_name(*NEW String(pool(), XDOC_CLASS_NAME)); - - /// @test how to create empty type html? - +/// @test how to create empty type html? +MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, xnode_class) { /// DOM1 // Element createElement(in DOMString tagName) raises(DOMException); @@ -716,22 +1026,34 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool add_native_method("createAttribute", Method::CT_DYNAMIC, _createAttribute, 1, 1); // EntityReference createEntityReference(in DOMString name) raises(DOMException); add_native_method("createEntityReference", Method::CT_DYNAMIC, _createEntityReference, 1, 1); - // NodeList getElementsByTagName(in DOMString tagname); + // NodeList getElementsByTagName(in DOMString name); add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1); - // ^xdoc.getElementsByTagNameNS[namespaceURI;localName] = array of nodes - add_native_method("getElementsByTagNameNS", Method::CT_DYNAMIC, _getElementsByTagNameNS, 2, 2); - /// DOM2(?) + /// DOM2 // ^xdoc.getElementById[elementId] add_native_method("getElementById", Method::CT_DYNAMIC, _getElementById, 1, 1); + // 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); + /// parser // ^xdoc::create{qualifiedName} - add_native_method("create", Method::CT_DYNAMIC, _create, 1, 1); - // ^xdoc::set[xml] - add_native_method("set", Method::CT_DYNAMIC, _set, 1, 1); + // ^xdoc::create[xml] + // ^xdoc::create[URI][xml] + add_native_method("create", Method::CT_DYNAMIC, _create, 1, 2); + // for backward compatibility with <=v 1.82 2002/01/31 11:51:46 paf + add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1); // ^xdoc::load[some.xml] add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1); @@ -748,29 +1070,18 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool // ^xdoc.file[options hash] file with "" add_native_method("file", Method::CT_DYNAMIC, _file, 0, 1); - // ^xdoc.transform[stylesheet file_name] - // ^xdoc.transform[stylesheet file_name;params hash] + // ^xdoc.transform[stylesheet file_name/xdoc] + // ^xdoc.transform[stylesheet file_name/xdoc;params hash] add_native_method("transform", Method::CT_DYNAMIC, _transform, 1, 2); } -void MXdoc::configure_admin(Request& r) { -} +# else -// global variable - -Methoded *Xdoc_class; +#include "classes.h" -// creator +// global variable -#endif +DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive -Methoded *MXdoc_create(Pool& pool) { - return -#ifdef XML - Xdoc_class=new(pool) MXdoc(pool) -#else - 0 #endif - ; -}