--- parser3/src/classes/xdoc.C 2001/10/26 12:21:35 1.35 +++ parser3/src/classes/xdoc.C 2005/07/28 11:23:01 1.147 @@ -1,48 +1,35 @@ /** @file Parser: @b xdoc parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: xdoc.C,v 1.35 2001/10/26 12:21:35 paf Exp $ + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -#include "pa_types.h" -#include "classes.h" + +#include "pa_config_includes.h" + #ifdef XML +static const char * const IDENT_XDOC_C="$Date: 2005/07/28 11:23:01 $"; + +#include "gdome.h" +#include "libxml/tree.h" +#include "libxml/HTMLtree.h" +#include "libxslt/xsltInternals.h" +#include "libxslt/transform.h" +#include "libxslt/xsltutils.h" +#include "libxslt/variables.h" +#include "libxslt/imports.h" + +#include "pa_vmethod_frame.h" + +#include "pa_stylesheet_manager.h" #include "pa_request.h" #include "pa_vxdoc.h" -#include "pa_stylesheet_manager.h" -#include "pa_stylesheet_connection.h" +#include "pa_charset.h" #include "pa_vfile.h" +#include "pa_xml_exception.h" #include "xnode.h" -#include -#include -#include -#include -#include "XalanTransformer2.hpp" -#include -# include -# include -# include -# include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - // defines #define XDOC_CLASS_NAME "xdoc" @@ -52,663 +39,839 @@ #define XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML "html" #define XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT "text" -#define XDOC_OUTPUT_ENCODING_OPTION_NAME "encoding" - -#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, false); } + Value* create_new_value(Pool&, HashStringValue&) { 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; +}; + +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; +}; -public: // Methoded - bool used_directly() { return true; } - void configure_admin(Request& r); +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, GdomeNode *node, + GdomeException exc) { + if(!node || exc) + throw XmlException(0, exc); + + // write out result + r.write_no_lang(*new VXnode(&r.charsets, xdoc, 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); - - const String& tagName=params->as_string(0, "tagName must be string"); - - try { - XalanNode *node= - vdoc.get_document(pool, &method_name). - createElement(*pool.transcode(tagName)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); - } catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } +static void _createElement(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + 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).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, vdoc, node, exc); } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, const String& method_name, MethodParams *) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - XalanNode *node= - vdoc.get_document(pool, &method_name). - createDocumentFragment(); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); +static void _createDocumentFragment(Request& r, MethodParams&) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + GdomeException exc; + GdomeNode *node= + (GdomeNode *)gdome_doc_createDocumentFragment( + vdoc.get_document(), + &exc); + writeNode(r, vdoc, 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); - - const String& data=params->as_string(0, "data must be string"); - - XalanNode *node= - vdoc.get_document(pool, &method_name). - createTextNode(*pool.transcode(data)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); +static void _createTextNode(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + 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).use(), + &exc); + writeNode(r, vdoc, 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); - - const String& data=params->as_string(0, "data must be string"); - - XalanNode *node= - vdoc.get_document(pool, &method_name). - createComment(*pool.transcode(data)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); +static void _createComment(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + 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).use(), + &exc); + writeNode(r, vdoc, 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); - - const String& data=params->as_string(0, "data must be string"); - - try { - XalanNode *node= - vdoc.get_document(pool, &method_name). - createCDATASection(*pool.transcode(data)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); - } catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } +static void _createCDATASection(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + 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).use(), + &exc); + writeNode(r, vdoc, 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); - - const String& target=params->as_string(0, "data must be string"); - const String& data=params->as_string(1, "data must be string"); - - try { - XalanNode *node= - vdoc.get_document(pool, &method_name). - createProcessingInstruction(*pool.transcode(target), *pool.transcode(data)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); - } catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } +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"); + + GdomeException exc; + GdomeNode *node=(GdomeNode *)gdome_doc_createProcessingInstruction( + vdoc.get_document(), + r.transcode(target).use(), + r.transcode(data).use(), + &exc); + writeNode(r, vdoc, 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); - - const String& name=params->as_string(0, "name must be string"); - - try { - XalanNode *node= - vdoc.get_document(pool, &method_name). - createAttribute(*pool.transcode(name)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); - } catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } +static void _createAttribute(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + 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).use(), + &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, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - const String& name=params->as_string(0, "name must be string"); - - try { - XalanNode *node= - vdoc.get_document(pool, &method_name). - createEntityReference(*pool.transcode(name)); - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - r.write_no_lang(result); - } catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } -} +static void _createEntityReference(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); -/* -static void _getElementsByTagName(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - // tagname - const char *name=params->as_string(0, "name must be string").cstr(String::UL_XML); - - VHash& result=*new(pool) VHash(pool); - if(const XalanNodeList *nodes= - vdoc.get_document(pool, &method_name).getElementsByTagName(XalanDOMString(name))) { - for(int i=0; igetLength(); i++) { - String& skey=*new(pool) String(pool); - { - char *buf=(char *)pool.malloc(MAX_NUMBER); - snprintf(buf, MAX_NUMBER, "%d", i); - skey << buf; - } + const String& name=params.as_string(0, "name must be string"); - result.hash().put(skey, new(pool) VXnode(pool, nodes->item(i))); - } - } + GdomeException exc; + GdomeNode *node=(GdomeNode *)gdome_doc_createEntityReference( + vdoc.get_document(), + r.transcode(name).use(), + &exc); + writeNode(r, vdoc, node, exc); +} + +// 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"); + + VHash& result=*new VHash; + GdomeException exc; + if(GdomeNodeList *nodes= + gdome_doc_getElementsByTagName( + 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 char *namespaceURI=params->as_string(0, "namespaceURI must be string").cstr(String::UL_XML); - const char *localName=params->as_string(0, "localName must be string").cstr(String::UL_XML); - - VHash& result=*new(pool) VHash(pool); - if(const XalanNodeList *nodes= - vdoc.get_document(pool, &method_name).getElementsByTagNameNS( - XalanDOMString(namespaceURI), XalanDOMString(localName))) { - for(int i=0; igetLength(); i++) { - String& skey=*new(pool) String(pool); - { - char *buf=(char *)pool.malloc(MAX_NUMBER); - snprintf(buf, MAX_NUMBER, "%d", i); - skey << buf; - } + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& localName=params.as_string(1, "localName must be string"); - result.hash().put(skey, new(pool) VXnode(pool, nodes->item(i))); - } + GdomeException exc; + VHash& result=*new VHash; + if(GdomeNodeList *nodes= + gdome_doc_getElementsByTagNameNS( + vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(localName).use(), + &exc)) { + gulong length=gdome_nl_length(nodes, &exc); + for(gulong i=0; i...} + 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); + } - String& fstring; - -}; + // 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); -class XalanSourceTreeParserLiaison2: public XalanSourceTreeParserLiaison { -public: - XalanSourceTreeParserLiaison2(XalanSourceTreeDOMSupport& theSupport) : XalanSourceTreeParserLiaison(theSupport), - ferror_handler(new HandlerBase) { + set_encoding=true; + // must be last action in if, see after if} } - - XalanDocument* - parseXMLStream2( - const InputSource& inputSource) { - XalanSourceTreeContentHandler theContentHandler(createXalanSourceTreeDocument()); - XalanAutoPtr theReader(XMLReaderFactory::createXMLReader()); - theReader->setContentHandler(&theContentHandler); - theReader->setDTDHandler(&theContentHandler); - theReader->setErrorHandler(ferror_handler); // disable stderr output - theReader->setLexicalHandler(&theContentHandler); - EntityResolver* const theResolver = getEntityResolver(); - if (theResolver != 0) { - theReader->setEntityResolver(theResolver); - } - theReader->parse(inputSource); - return theContentHandler.getDocument(); + // must be first action after if} + // replace any previous parsed source + { + vdoc.set_document(&r.charsets, document); + GdomeException exc; + gdome_doc_unref(document, &exc); } - ~XalanSourceTreeParserLiaison2() { - delete ferror_handler; + // 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)); } -private: - ErrorHandler *ferror_handler; -}; - -class XalanDefaultParsedSource2 : public XalanParsedSource -{ -public: - - XalanDefaultParsedSource2(const XSLTInputSource& theInputSource); - - virtual XalanDocument* - getDocument() const; - - virtual XalanParsedSourceHelper* - createHelper() const; - -private: - - XalanSourceTreeDOMSupport m_domSupport; - - XalanSourceTreeParserLiaison2 m_parserLiaison2; - - XalanSourceTreeDocument* const m_parsedSource; -}; - -XalanDefaultParsedSource2::XalanDefaultParsedSource2(const XSLTInputSource& theInputSource): - XalanParsedSource(), - m_domSupport(), - m_parserLiaison2(m_domSupport), - m_parsedSource(m_parserLiaison2.mapDocument(m_parserLiaison2.parseXMLStream2(theInputSource))) -{ - assert(m_parsedSource != 0); - - m_domSupport.setParserLiaison(&m_parserLiaison2); } +static void _load(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); - -XalanDocument* -XalanDefaultParsedSource2::getDocument() const -{ - return m_parsedSource; + // filespec + 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(&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)); +*/ } - - -XalanParsedSourceHelper* -XalanDefaultParsedSource2::createHelper() const -{ - return new XalanDefaultParsedSourceHelper(m_domSupport); +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) { +/* + +*/ - - -static void create_optioned_listener( - const char *& content_type, const char *& charset, FormatterListener *& listener, - Pool& pool, - const String& method_name, MethodParams *params, int index, Writer& writer) { - // default encoding from pool - const String *scharset=&pool.get_charset(); - const String *method=0; - XalanDOMString xalan_encoding; - - if(params->size()>index) { - Value& voptions=params->as_no_junction(index, "options must be string"); + // 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(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)))) - method=&vmethod->as_string(); + 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|...] - if(Value *vencoding=static_cast(options->get(*new(pool) - String(pool, XDOC_OUTPUT_ENCODING_OPTION_NAME)))) { - scharset=&vencoding->as_string(); - } + 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); } } } - xalan_encoding.append(charset=scharset->cstr()); - if(!method/*default='xml'*/ || *method == XDOC_OUTPUT_METHOD_OPTION_VALUE_XML) { - content_type="text/xml"; - listener=new FormatterToXML(writer, - XalanDOMString(), // version - true, // doIndent - XDOC_OUTPUT_DEFAULT_INDENT, // indent - xalan_encoding // encoding - ); - } else if(*method == XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML) { - content_type="text/html"; - listener=new FormatterToHTML(writer, - xalan_encoding, // encoding - XalanDOMString(), // mediaType - XalanDOMString(), // doctypeSystem; String to be printed at the top of the document - XalanDOMString(), // doctypePublic - true, // doIndent - XDOC_OUTPUT_DEFAULT_INDENT // indent - ); - } else if(*method == XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT) { - content_type="text/plain"; - listener=new FormatterToText(writer, - xalan_encoding // encoding - ); - } else - throw Exception(0, 0, - method, - 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 "'"); - - // never reached -} - -static void _save(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - - // filespec - const String& file_name=params->as_string(0, "file name must be string"); - const char *filespec=r.absolute(file_name).cstr(String::UL_FILE_SPEC); - - // node - XalanNode& node=vnode.get_node(pool, &method_name); - - try { - XalanFileOutputStream stream(XalanDOMString(filespec, strlen(filespec))); - XalanOutputStreamPrintWriter writer(stream); - const char *content_type, *charset; - FormatterListener *formatterListener; - create_optioned_listener(content_type, charset, formatterListener, - pool, method_name, params, 1, writer); - FormatterTreeWalker treeWalker(*formatterListener); - treeWalker.traverse(&node); // Walk that node and produce the XML... - } catch(const XSLException& e) { - Exception::provide_source(pool, &method_name, e); + // 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"); } } -static void _string(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - // node - XalanNode *node=&vdoc.get_document(pool, &method_name);//.getDocumentElement(); - if(!node) - throw Exception(0, 0, - &method_name, - "no documentElement"); - - try { - String parserString=*new(pool) String(pool); - ParserStringXalanOutputStream stream(parserString); - XalanOutputStreamPrintWriter writer(stream); - const char *content_type, *charset; - FormatterListener *formatterListener; - create_optioned_listener(content_type, charset, formatterListener, - pool, method_name, params, 0, writer); - FormatterTreeWalker treeWalker(*formatterListener); - treeWalker.traverse(node); // Walk that node and produce the XML... +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; + 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", 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) + renderer=0; + + xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(renderer)); + + xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); + if(!stylesheet.get()) + throw Exception(0, + 0, + "xsltNewStylesheet failed"); + + #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()); + 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 XmlException(0, exc); + } - // write out result - r.write_no_lang(parserString); - } catch(const XSLException& e) { - Exception::provide_source(pool, &method_name, e); + // write out result + char *gnome_str; size_t gnome_length; + if(outputBuffer->conv) { + gnome_length=outputBuffer->conv->use; + gnome_str=(char *)outputBuffer->conv->content; + } else { + 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; -static void _file(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXnode& vnode=*static_cast(r.self); - - // node - XalanNode& node=vnode.get_node(pool, &method_name); - - try { - String& parserString=*new(pool) String(pool); - ParserStringXalanOutputStream stream(parserString); - XalanOutputStreamPrintWriter writer(stream); - const char *content_type, *charset; - FormatterListener *formatterListener; - create_optioned_listener(content_type, charset, formatterListener, - pool, method_name, params, 0, writer); - FormatterTreeWalker treeWalker(*formatterListener); - treeWalker.traverse(&node); // Walk that node and produce the XML... + if(file_spec) + file_write(*file_spec, + gnome_str, gnome_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 + r.write_no_lang(String(buf.str, buf.length)); - // write out result - VFile& vfile=*new(pool) VFile(pool); - const char *cstr=parserString.cstr(); - String *scontent_type=new(pool) String(pool, content_type); - Value *vcontent_type; - if(charset) { - VHash *vhcontent_type=new(pool) VHash(pool); - vhcontent_type->hash().put(*value_name, new(pool) VString(*scontent_type)); - String *scharset=new(pool) String(pool, charset); - vhcontent_type->hash().put(*new(pool) String(pool, "charset"), new(pool) VString(*scharset)); - vcontent_type=vhcontent_type; - } else - vcontent_type=new(pool) VString(*scontent_type); - vfile.set(false/*tainted*/, cstr, strlen(cstr), 0/*file_name*/, vcontent_type); - r.write_no_lang(vfile); - } catch(const XSLException& e) { - Exception::provide_source(pool, &method_name, e); - } + // 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); } -static void _set(Request& r, const String& method_name, MethodParams *params) { - //_asm int 3; - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(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(); - - std::istrstream stream(xml.cstr()); - const XalanParsedSource* parsedSource; - - try { - parsedSource = new XalanDefaultParsedSource2(&stream); - } - catch (XSLException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (SAXParseException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (SAXException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (XMLException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } +static void _save(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); - // replace any previous parsed source - vdoc.set_parsed_source(*parsedSource); + 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 _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"); - - XalanDocument& document=*new XercesDocumentBridge( - DOM_Document::createDocument(), - 0, - false /*threadSafe*/, - false /*don' buildBridge -- too early, empty document*/); - - /// +createXMLDecl ? - document.appendChild(document.createElement(*pool.transcode(qualifiedName))); - - // replace any previous document - vdoc.set_document(document, true/*owns*/); +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*/, + 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)); } -static void _load(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - // filespec - const String& file_name=params->as_string(0, "file name must be string"); - const char *filespec=r.absolute(file_name).cstr(String::UL_FILE_SPEC); - - const XalanParsedSource* parsedSource; - try { - parsedSource = new XalanDefaultParsedSource2(filespec); - } - catch (XSLException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (SAXParseException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (SAXException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch (XMLException& e) { - Exception::provide_source(pool, &method_name, e); - } - catch(const XalanDOMException& e) { - Exception::provide_source(pool, &method_name, e); - } - - // replace any previous parsed source - vdoc.set_parsed_source(*parsedSource); +#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 void add_xslt_param(const Hash::Key& aattribute, Hash::Val *ameaning, - void *info) { - XalanTransformer2& transformer=*static_cast(info); - const char *attribute_cstr=aattribute.cstr(); - const char *meaning_cstr=static_cast(ameaning)->as_string().cstr(); +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, + 0/*already quoted-inserted transform_params*/, + 0/*const char* output*/, + 0/*FILE *profile*/, + transformContext.get()); + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw XmlException(stylesheet_source, exc); + } + + //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, + "gdome_xml_doc_mkref failed"); + VXdoc& result=*new VXdoc(&r.charsets, gdomeDocument); + /* grabbing options + + + */ + VXdoc::Output_options& oo=result.output_options; - transformer.setStylesheetParam( - XalanDOMString(attribute_cstr), - XalanDOMString(meaning_cstr)); -} + 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; + oo.version=stylesheet->version?&r.transcode(stylesheet->version):0; + oo.standalone=stylesheet->standalone; + oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration; -static void _transform(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); + // return + return result; +} +static void _transform(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); // params - if(params->size()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters parameter must be string"); - if(vparams.is_defined()) - if(Hash *params=vparams.get_hash(&method_name)) - params->for_each(add_xslt_param, &vdoc.transformer()); - else - throw Exception(0, 0, - &method_name, + 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"); } - // stylesheet - const String& stylesheet_file_name=params->as_string(0, "file name must be string"); - const String& stylesheet_filespec=r.absolute(stylesheet_file_name); - //_asm int 3; - Stylesheet_connection& connection=stylesheet_manager->get_connection(stylesheet_filespec); - - // target - XalanDocument* target=vdoc.parser_xerces_liaison().createDocument(); - - // transform - try { - if(vdoc.has_parsed_source()) { // set|load, not create? - vdoc.transformer().transform2( - vdoc.get_parsed_source(pool, &method_name), - &connection.stylesheet(true/*nocache*/), - target); - } else { - target=vdoc.parser_xerces_liaison().createDocument(); - vdoc.transformer().transform2( - vdoc.get_document(pool, &method_name), - &connection.stylesheet(true/*nocache*/), - target); + 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); } - } - catch (XSLException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (SAXParseException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (SAXException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch (XMLException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); - } - catch(const XalanDOMException& e) { - connection.close(); - Exception::provide_source(pool, &stylesheet_file_name, e); + 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 - VXdoc& result=*new(pool) VXdoc(pool, target, false/*owns not*/); - r.write_no_lang(result); + r.write_no_lang(*result); } -static void _getElementById(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); - - // elementId - const String& elementId=params->as_string(0, "elementID must be string"); - - if(XalanNode *node= - vdoc.get_document(pool, &method_name).getElementById(*pool.transcode(elementId))) { - // write out result - VXnode& result=*new(pool) VXnode(pool, node, false); - 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); @@ -727,22 +890,38 @@ 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); - /* - // ^xdoc.getElementsByTagName[tagname] - 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); - */ + // NodeList getElementsByTagName(in DOMString name); + add_native_method("getElementsByTagName", Method::CT_DYNAMIC, _getElementsByTagName, 1, 1); - /// 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} + // ^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); + // ^xdoc.save[some.xml] // ^xdoc.save[some.xml;options hash] add_native_method("save", Method::CT_DYNAMIC, _save, 1, 2); @@ -755,37 +934,18 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool // ^xdoc.file[options hash] file with "" add_native_method("file", Method::CT_DYNAMIC, _file, 0, 1); - // ^xdoc::set[xml] - add_native_method("set", Method::CT_DYNAMIC, _set, 1, 1); - // ^xdoc::create{qualifiedName} - add_native_method("create", Method::CT_DYNAMIC, _create, 1, 1); - - // ^xdoc::load[some.xml] - add_native_method("load", Method::CT_DYNAMIC, _load, 1, 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) { -} - -// global variable +# else -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 - ; -}