--- parser3/src/classes/xdoc.C 2002/01/15 16:02:42 1.63 +++ parser3/src/classes/xdoc.C 2002/03/27 15:30:34 1.87 @@ -1,26 +1,28 @@ /** @file Parser: @b xdoc parser class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: xdoc.C,v 1.63 2002/01/15 16:02:42 paf Exp $ + $Id: xdoc.C,v 1.87 2002/03/27 15:30:34 paf Exp $ */ -#include "pa_types.h" +#include "classes.h" #ifdef XML #include "pa_stylesheet_connection.h" -#include "classes.h" #include "pa_request.h" #include "pa_vxdoc.h" #include "pa_charset.h" #include "pa_vfile.h" #include "xnode.h" +#include "gdome.h" +#include "libxml/tree.h" extern "C" { #include "gdomecore/gdome-xml-node.h" #include "gdomecore/gdome-xml-document.h" }; +#include "libxslt/xsltInternals.h" #include "libxslt/transform.h" #include "libxslt/xsltutils.h" @@ -32,7 +34,6 @@ 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 @@ -52,8 +53,8 @@ public: // Methoded class xmlOutputBuffer_auto_ptr { public: - explicit xmlOutputBuffer_auto_ptr(xmlOutputBuffer *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + 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) @@ -83,14 +84,78 @@ private: 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, GdomeException exc) { if(!node || exc) - throw Exception(0, 0, + throw Exception( &method_name, exc); @@ -220,70 +285,6 @@ static void _createEntityReference(Reque writeNode(r, method_name, node, exc); } -static void _getElementsByTagName(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"); - - GdomeException exc; - VHash& result=*new(pool) VHash(pool); - if(GdomeNodeList *nodes= - gdome_doc_getElementsByTagName( - vdoc.get_document(&method_name), - pool.transcode(name).get(), - &exc)) { - gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; i(r.self); - - // namespaceURI;localName - const String& namespaceURI=params->as_string(0, "namespaceURI must be string"); - const String& localName=params->as_string(0, "localName must be string"); - - GdomeException exc; - VHash& result=*new(pool) VHash(pool); - if(GdomeNodeList *nodes= - gdome_doc_getElementsByTagNameNS( - vdoc.get_document(&method_name), - pool.transcode(namespaceURI).get(), - pool.transcode(localName).get(), - &exc)) { - gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; i(r.self); @@ -299,76 +300,89 @@ static void _getElementById(Request& r, // write out result VXnode& result=*new(pool) VXnode(pool, node); r.write_no_lang(result); - } else if(exc) - throw Exception(0, 0, + } else if(exc || xmlHaveGenericErrors()) + throw Exception( &method_name, 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; +static void _importNode(Request& r, const String& method_name, MethodParams *params) { Pool& pool=r.pool(); VXdoc& vdoc=*static_cast(r.self); - const String& qualifiedName=params->as_string(0, "qualifiedName must be string"); + GdomeNode *importedNode= + as_node(pool, method_name, 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, + GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(&method_name), + importedNode, + deep, &exc); + if(exc) + throw Exception( &method_name, exc); - /// +xalan createXMLDecl ? - - // replace any previous parsed source - vdoc.set_document(document); + // write out result + r.write_no_lang(*new(pool) VXnode(pool, 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(); + Value& param=params->get(0); + GdomeDocument *document; + if(param.get_junction()) { // {} + Temp_lang temp_lang(r, String::UL_XML); + const String& xml=r.process(param).as_string(); + + const char *cstr=xml.cstr(String::UL_UNSPECIFIED); + document=(GdomeDocument *) + gdome_xml_n_mkref((xmlNode *)xmlParseMemory( + cstr, strlen(cstr) + )); + if(!document || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception( + &method_name, + exc); + } + } else { // [name] + const String& qualifiedName=param.as_string(); - GdomeException exc; - GdomeDocument *document=gdome_di_createDocFromMemory(domimpl, - xml.cstr(String::UL_UNSPECIFIED, r.connection), - GDOME_LOAD_PARSING - /* GDOME_LOAD_VALIDATING pending until kill warning of no-dtd*/ - /*|GDOME_LOAD_SUBSTITUTE_ENTITIES */, - &exc); - if(!document || exc) - throw Exception(0, 0, - &method_name, - exc); + GdomeException exc; + /* + GdomeDocumentType *documentType=gdome_di_createDocumentType ( + docimpl, + pool.transcode(qualifiedName), + 0/*publicId* /, + 0/*systemId* /, + &exc); + if(!documentType || exc || xmlHaveGenericErrors()) + throw Exception( + &method_name, + exc); + */ + document=gdome_di_createDocument (domimpl, + 0/*namespaceURI*/, + pool.transcode(qualifiedName).get(), + 0/*doctype*/, + &exc); + if(!document || exc || xmlHaveGenericErrors()) + throw Exception( + &method_name, + exc); + /// +xalan createXMLDecl ? + } // replace any previous parsed source vdoc.set_document(document); } @@ -381,17 +395,14 @@ static void _load(Request& r, const Stri 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 pending until kill warning of no-dtd*/ - /*|GDOME_LOAD_SUBSTITUTE_ENTITIES */, - &exc); - if(!document || exc) - throw Exception(0, 0, - &method_name, + GdomeDocument *document=(GdomeDocument *) + gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr())); + if(!document || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception( + &uri, exc); + } // replace any previous parsed source vdoc.set_document(document); @@ -415,7 +426,7 @@ static void param_option_over_output_opt 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); } @@ -496,7 +507,7 @@ static void xdoc2buf(Pool& pool, VXdoc& const char *encoding_cstr=oo.encoding->cstr(); xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr); if(!encoder) - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "encoding '%s' not supported", encoding_cstr); // UTF-8 encoder contains empty input/output converters, @@ -507,9 +518,9 @@ static void xdoc2buf(Pool& pool, VXdoc& xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder)); - xsltStylesheet *stylesheet=xsltNewStylesheet(); - if(!stylesheet) - throw Exception(0, 0, + xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); + if(!stylesheet.get()) + throw Exception(0, &method_name, "xsltNewStylesheet failed"); @@ -528,9 +539,13 @@ static void xdoc2buf(Pool& pool, VXdoc& OOE2STYLE(standalone); OOE2STYLE(omitXmlDeclaration); - xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n; - xsltSaveResultTo(outputBuffer.get(), document, stylesheet); - xsltFreeStylesheet(stylesheet); + 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( + &method_name, + exc); + } // write out result char *gnome_buf; size_t gnome_size; @@ -542,15 +557,15 @@ static void xdoc2buf(Pool& pool, VXdoc& gnome_buf=(char *)outputBuffer->buffer->content; } if(file_spec) - file_write(pool, + file_write( *file_spec, gnome_buf, gnome_size, true/*as_text*/); - else { - *parser_size=gnome_size; + 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 _file(Request& r, const String& method_name, MethodParams *params) { @@ -560,7 +575,7 @@ static void _file(Request& r, const Stri char *buf; size_t buf_size; xdoc2buf(pool, vdoc, method_name, params, 0, oo, - 0/*memory*/, + 0/*not to file, to memory*/, &buf, &buf_size); // write out result r.write_no_lang(*new(pool) String(pool, buf, buf_size)); @@ -601,7 +616,7 @@ static void _string(Request& r, const St char *buf; size_t buf_size; xdoc2buf(pool, vdoc, method_name, params, 0, oo, - 0/*to memory*/, + 0/*not to file, to memory*/, &buf, &buf_size); // write out result r.write_no_lang(*new(pool) String(pool, buf, buf_size)); @@ -631,33 +646,32 @@ static void _transform(Request& r, const params->for_each(add_xslt_param, transform_params); transform_params[params->size()*2]=0; } else - throw Exception(0, 0, + throw Exception("parser.runtime", &method_name, "transform parameters parameter must be hash"); } // 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); + Stylesheet_connection_ptr 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); + 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); - if(!transformed) { - xsltFreeTransformContext(transformContext); - // close - connection.close(); - throw Exception(0, 0, - &method_name, - "transform failed. TODO: show errors"); + transformContext.get()); + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception( + &stylesheet_filespec, + exc); } //gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE type, fixing @@ -665,7 +679,7 @@ static void _transform(Request& r, const // constructing result GdomeDocument *gdomeDocument=gdome_xml_doc_mkref(transformed); if(!gdomeDocument) - throw Exception(0, 0, + throw Exception(0, &method_name, "gdome_xml_doc_mkref failed"); VXdoc& result=*new(pool) VXdoc(pool, gdomeDocument); @@ -697,13 +711,8 @@ static void _transform(Request& r, const oo.standalone=stylesheet->standalone!=0; oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; - xsltFreeTransformContext(transformContext); - // close - connection.close(); - // write out result r.write_no_lang(result); - } // constructor @@ -731,22 +740,22 @@ 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); - 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); + /// parser // ^xdoc::create{qualifiedName} + // ^xdoc::_create[xml] add_native_method("create", Method::CT_DYNAMIC, _create, 1, 1); - // ^xdoc::set[xml] - add_native_method("set", Method::CT_DYNAMIC, _set, 1, 1); + // 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);