--- parser3/src/classes/xdoc.C 2001/12/28 18:12:30 1.55 +++ parser3/src/classes/xdoc.C 2002/01/28 08:20:33 1.78 @@ -4,20 +4,30 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: xdoc.C,v 1.55 2001/12/28 18:12:30 paf Exp $ + $Id: xdoc.C,v 1.78 2002/01/28 08:20:33 paf Exp $ */ #include "pa_types.h" -#include "classes.h" #ifdef XML +#include "gdome.h" +#include "libxml/tree.h" +extern "C" { +#include "gdomecore/gdome-xml-node.h" +#include "gdomecore/gdome-xml-document.h" +}; +#include "libxslt/xsltInternals.h" +#include "libxslt/transform.h" +#include "libxslt/xsltutils.h" + +#include "pa_stylesheet_connection.h" +#include "classes.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 "xnode.h" + // defines #define XDOC_CLASS_NAME "xdoc" @@ -26,7 +36,6 @@ #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 @@ -42,6 +51,107 @@ public: // Methoded void configure_admin(Request& r); }; +// helper classes + +class xmlOutputBuffer_auto_ptr { +public: + 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; +}; + +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, @@ -68,7 +178,7 @@ static void _createElement(Request& r, c GdomeException exc; GdomeNode *node= (GdomeNode *)gdome_doc_createElement(vdoc.get_document(&method_name), - pool.transcode(tagName), + pool.transcode(tagName).get(), &exc); writeNode(r, method_name, node, exc); } @@ -96,7 +206,7 @@ static void _createTextNode(Request& r, GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createTextNode( vdoc.get_document(&method_name), - pool.transcode(data), + pool.transcode(data).get(), &exc); writeNode(r, method_name, node, exc); } @@ -111,7 +221,7 @@ static void _createComment(Request& r, c GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createComment( vdoc.get_document(&method_name), - pool.transcode(data), + pool.transcode(data).get(), &exc); writeNode(r, method_name, node, exc); } @@ -126,7 +236,7 @@ static void _createCDATASection(Request& GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createCDATASection( vdoc.get_document(&method_name), - pool.transcode(data), + pool.transcode(data).get(), &exc); writeNode(r, method_name, node, exc); } @@ -142,8 +252,8 @@ static void _createProcessingInstruction GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createProcessingInstruction( vdoc.get_document(&method_name), - pool.transcode(target), - pool.transcode(data), + pool.transcode(target).get(), + pool.transcode(data).get(), &exc); writeNode(r, method_name, node, exc); } @@ -158,7 +268,7 @@ static void _createAttribute(Request& r, GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createAttribute( vdoc.get_document(&method_name), - pool.transcode(name), + pool.transcode(name).get(), &exc); writeNode(r, method_name, node, exc); } @@ -172,7 +282,7 @@ static void _createEntityReference(Reque GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createEntityReference( vdoc.get_document(&method_name), - pool.transcode(name), + pool.transcode(name).get(), &exc); writeNode(r, method_name, node, exc); } @@ -188,7 +298,7 @@ static void _getElementsByTagName(Reques if(GdomeNodeList *nodes= gdome_doc_getElementsByTagName( vdoc.get_document(&method_name), - pool.transcode(name), + pool.transcode(name).get(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ias_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) + GdomeDocument *document=(GdomeDocument *) + gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr())); + if(!document || xmlHaveGenericErrors()) { + GdomeException exc=0; throw Exception(0, 0, - &method_name, + &uri, exc); + } // 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()); - } + const String *& output_option) { + if(Value *value=static_cast(param_options->get(*new(pool) String(pool, + option_name)))) + output_option=&value->as_string(); } static void param_option_over_output_option(Pool& pool, Hash *param_options, const char *option_name, @@ -382,20 +484,9 @@ static void param_option_over_output_opt } } - 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; -* / - +static void prepare_output_options( + Pool& pool, const String& method_name, MethodParams *params, int index, + VXdoc::Output_options& oo) { /* -* / - - /* - fToXML->setStripCData(stripCData); - fToXML->setEscapeCData(escapeCData); - * / +*/ // configuring with options from parameter... if(params->size()>index) { @@ -423,16 +509,14 @@ static void param_option_over_output_opt // $.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(); + oo.method=&vmethod->as_string(); // $.version[1.0] param_option_over_output_option(pool, options, "version", oo.version); // $.encoding[windows-1251|...] param_option_over_output_option(pool, 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(pool, options, "omit-xml-declaration", oo.omitXmlDeclaration); // $.standalone[yes|no] param_option_over_output_option(pool, options, "standalone", oo.standalone); // $.doctype-public[?] @@ -440,7 +524,7 @@ static void param_option_over_output_opt // $.doctype-system[?] param_option_over_output_option(pool, options, "doctype-system", oo.doctypeSystem); // $.indent[yes|no] - param_option_over_output_option(pool, options, "indent", oo.doIndent); + param_option_over_output_option(pool, options, "indent", oo.indent); // $.media-type[text/{html|xml|plain}] param_option_over_output_option(pool, options, "media-type", oo.mediaType); } @@ -448,271 +532,240 @@ static void param_option_over_output_opt } // default encoding from pool - if(oo.encoding.empty()) - oo.encoding.append(pool.get_source_charset().name().cstr()); + if(!oo.encoding) + oo.encoding=&pool.get_source_charset().name(); // default method=xml if(!oo.method) - oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML; + oo.method=new(pool) String(pool, 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(pool) String(pool, "text/xml"); + else if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML) + oo.mediaType=new(pool) String(pool, "text/html"); + else // XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT & all others + oo.mediaType=new(pool) String(pool, "text/plain"); + } +} - 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 +static void xdoc2buf(Pool& pool, VXdoc& vdoc, + const String& method_name, MethodParams *params, int index, + VXdoc::Output_options& oo, + const String *file_spec, + char **parser_buf, size_t *parser_size) { + prepare_output_options(pool, method_name, params, index, + oo); + + const char *encoding_cstr=oo.encoding->cstr(); + xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr); + if(!encoder) 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 "'"); + "encoding '%s' not supported", encoding_cstr); + // UTF-8 encoder contains empty input/output converters, + // which is wrong for xmlOutputBufferCreateIO + // while zero encoder goes perfectly + if(encoder && strcmp(encoder->name, "UTF-8")==0) + encoder=0; - // never reached -} -*/ + xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder)); -static void _save(Request& r, const String& method_name, MethodParams *params) { - Pool& pool=r.pool(); - VXdoc& vdoc=*static_cast(r.self); + xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); + if(!stylesheet.get()) + throw Exception(0, 0, + &method_name, + "xsltNewStylesheet failed"); - 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)) + #define OOS2STYLE(name) \ + stylesheet->name=oo.name?BAD_CAST g_strdup(pool.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(&method_name)); + if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) { + GdomeException exc=0; throw Exception(0, 0, &method_name, exc); + } + + // write out result + char *gnome_buf; size_t gnome_size; + if(outputBuffer->conv) { + gnome_size=outputBuffer->conv->use; + gnome_buf=(char *)outputBuffer->conv->content; + } else { + gnome_size=outputBuffer->buffer->use; + gnome_buf=(char *)outputBuffer->buffer->content; + } + if(file_spec) + file_write( + *file_spec, + gnome_buf, gnome_size, + true/*as_text*/); + else if(*parser_size=gnome_size) { + *parser_buf=(char *)pool.malloc(gnome_size); + memcpy(*parser_buf, gnome_buf, gnome_size); + } else + *parser_buf=0; } -static void _string(Request& r, const String& method_name, MethodParams *params) { +static void _file(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); + VXdoc::Output_options oo(vdoc.output_options); + char *buf; size_t buf_size; + xdoc2buf(pool, vdoc, method_name, params, 0, + oo, + 0/*not to file, to memory*/, + &buf, &buf_size); + // write out result + r.write_no_lang(*new(pool) String(pool, buf, buf_size)); - 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 size=strlen(mem); - char *buf=(char *)pool.malloc(size); - memcpy(buf, mem, size); - g_free(mem); // write out result - r.write_no_lang(*new(pool) String(pool, buf, size)); + VFile& vfile=*new(pool) VFile(pool); + Value *vcontent_type; + VHash *vhcontent_type=new(pool) VHash(pool); + vhcontent_type->hash(&method_name).put( + *value_name, + new(pool) VString(*oo.mediaType)); + vhcontent_type->hash(&method_name).put( + *new(pool) String(pool, "charset"), + new(pool) VString(*oo.encoding)); + vcontent_type=vhcontent_type; + + vfile.set(false/*tainted*/, buf, buf_size, 0/*file_name*/, vcontent_type); + r.write_no_lang(vfile); } -/* -static void _file(Request& r, const String& method_name, MethodParams *params) { +static void _save(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - VXnode& vnode=*static_cast(r.self); - - // node - GdomeNode *node=vnode.get_node(pool, &method_name); - try { - VXdoc::Output_options oo(vdoc.output_options); - String& parserString=*new(pool) String(pool); - ParserStringXalanOutputStream stream(parserString); - XalanOutputStreamPrintWriter writer(stream); - std::auto_ptr formatterListener= - create_optioned_listener(pool, method_name, params, 0, - oo, writer); - FormatterTreeWalker treeWalker(*formatterListener); - treeWalker.traverse(&node); // Walk that node and produce the XML... + const String& file_spec=r.absolute(params->as_string(0, "file name must be string")); + + VXdoc::Output_options oo(vdoc.output_options); + xdoc2buf(pool, vdoc, method_name, params, 1, + oo, + &file_spec, + 0, 0); +} - // write out result - VFile& vfile=*new(pool) VFile(pool); - const char *cstr=parserString.cstr(); - const String& scontent_type=pool.transcode(oo.mediaType); - Value *vcontent_type; - if(oo.encoding.empty()) - vcontent_type=new(pool) VString(scontent_type); - else { - VHash *vhcontent_type=new(pool) VHash(pool); - vhcontent_type->hash(&method_name).put(*value_name, new(pool) VString(scontent_type)); - const String& scharset=pool.transcode(oo.encoding); - vhcontent_type->hash(&method_name).put(*new(pool) String(pool, "charset"), new(pool) VString(scharset)); - vcontent_type=vhcontent_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); - } +static void _string(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + VXdoc& vdoc=*static_cast(r.self); + VXdoc::Output_options oo(vdoc.output_options); + char *buf; size_t buf_size; + xdoc2buf(pool, vdoc, method_name, params, 0, + oo, + 0/*not to file, to memory*/, + &buf, &buf_size); + // write out result + r.write_no_lang(*new(pool) String(pool, buf, buf_size)); } -*/ -/* -/// @test lang=String::UL_UNSPECIFIED? + 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(String::UL_UNSPECIFIED); - const char *meaning_cstr=static_cast(ameaning)->as_string().cstr(String::UL_UNSPECIFIED); - - transformer.setStylesheetParam( - XalanDOMString(attribute_cstr), - XalanDOMString(meaning_cstr)); + 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); // params + const char **transform_params=0; if(params->size()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters parameter must be string"); + Value& vparams=params->as_no_junction(1, "transform parameters must be hash"); if(vparams.is_defined()) - if(Hash *params=vparams.get_hash(&method_name)) - params->for_each(add_xslt_param, &vdoc.transformer()); - else + 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"); } // 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(); + const String& stylesheet_filespec=r.absolute(params->as_string(0, "file name must be string")); + Stylesheet_connection_ptr connection=stylesheet_manager->get_connection(stylesheet_filespec); // transform - try { - // note: - // actually, never found any difference between the two - // but still there some extra "xerces" words at start of transform body - // wich were originally "xalan" - // not daring to change that - - const XalanCompiledStylesheet& stylesheet=connection.stylesheet(false/*nocache* /); - if(vdoc.has_parsed_source()) { // set|load, not create? - vdoc.transformer().transform2( - vdoc.get_parsed_source(pool, &method_name), - &stylesheet, - target); - } else { - target=vdoc.parser_xerces_liaison().createDocument(); - vdoc.transformer().transform2( - vdoc.get_document(&method_name), - &stylesheet, - target); - } - VXdoc& result=*new(pool) VXdoc(pool, target, false/*owns not* /); - // write out result - r.write_no_lang(result); - // - if(const StylesheetRoot *stylesheetRoot=stylesheet.getStylesheetRoot()) { - /* - - * / - - VXdoc::Output_options& oo=result.output_options; - oo.encoding=stylesheetRoot->m_encoding; - oo.mediaType=stylesheetRoot->m_mediatype; - oo.doctypeSystem=stylesheetRoot->m_doctypeSystem; - oo.doctypePublic=stylesheetRoot->m_doctypePublic; - oo.doIndent=stylesheetRoot->m_indentResult; - oo.version=stylesheetRoot->m_version; - oo.standalone=stylesheetRoot->m_standalone; - oo.xmlDecl=!stylesheetRoot->m_omitxmlDecl; - - switch(stylesheetRoot->getOutputMethod()) { - case FormatterListener::OUTPUT_METHOD_HTML: - oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML; break; - case FormatterListener::OUTPUT_METHOD_TEXT: - oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT; break; - case FormatterListener::OUTPUT_METHOD_NONE: - case FormatterListener::OUTPUT_METHOD_XML: - oo.method=XDOC_OUTPUT_METHOD_OPTION_VALUE_XML; break; - default: - throw Exception(0, 0, - &method_name, - "unsupported output method specified"); - break; // never - } - } - } - 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); + xsltStylesheet *stylesheet=connection->stylesheet(false/*nocache*/); + xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(&method_name)); + xsltTransformContext_auto_ptr transformContext( + xsltNewTransformContext(stylesheet, document)); + xmlDoc *transformed=xsltApplyStylesheetUser( + stylesheet, + document, + transform_params, + 0/*const char *output*/, + 0/*FILE *profile*/, + transformContext.get()); + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception(0, 0, + &stylesheet_filespec, + exc); } - // close - connection.close(); + //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, + "gdome_xml_doc_mkref failed"); + VXdoc& result=*new(pool) VXdoc(pool, gdomeDocument); + /* grabbing options + + + */ + memset(&result.output_options, 0, sizeof(result.output_options)); + VXdoc::Output_options& oo=result.output_options; + + oo.method=stylesheet->method?&pool.transcode(stylesheet->method):0; + oo.encoding=stylesheet->encoding?&pool.transcode(stylesheet->encoding):0; + oo.mediaType=stylesheet->mediaType?&pool.transcode(stylesheet->mediaType):0; + oo.doctypeSystem=stylesheet->doctypeSystem?&pool.transcode(stylesheet->doctypeSystem):0; + oo.doctypePublic=stylesheet->doctypePublic?&pool.transcode(stylesheet->doctypePublic):0; + oo.indent=stylesheet->indent!=0; + oo.version=stylesheet->version?&pool.transcode(stylesheet->version):0; + oo.standalone=stylesheet->standalone!=0; + oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; + + // write out result + r.write_no_lang(result); } -*/ // constructor @@ -769,11 +822,11 @@ MXdoc::MXdoc(Pool& apool) : MXnode(apool // ^xdoc.file[] file with "" // ^xdoc.file[options hash] file with "" -// add_native_method("file", Method::CT_DYNAMIC, _file, 0, 1); + add_native_method("file", Method::CT_DYNAMIC, _file, 0, 1); // ^xdoc.transform[stylesheet file_name] // ^xdoc.transform[stylesheet file_name;params hash] -// add_native_method("transform", Method::CT_DYNAMIC, _transform, 1, 2); + add_native_method("transform", Method::CT_DYNAMIC, _transform, 1, 2); }