--- parser3/src/classes/xdoc.C 2002/01/16 10:28:34 1.65 +++ parser3/src/classes/xdoc.C 2002/08/15 09:07:49 1.98 @@ -1,28 +1,32 @@ /** @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.65 2002/01/16 10:28:34 paf Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -#include "pa_types.h" + +#include "classes.h" #ifdef XML +static const char* IDENT_XDOC_C="$Date: 2002/08/15 09:07:49 $"; + #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" +#include "libxslt/variables.h" // defines @@ -43,7 +47,6 @@ public: MXdoc(Pool& pool); public: // Methoded - bool used_directly() { return true; } void configure_admin(Request& r); }; @@ -51,8 +54,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) @@ -84,8 +87,8 @@ private: class xsltTransformContext_auto_ptr { public: - explicit xsltTransformContext_auto_ptr(xsltTransformContext *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + 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) @@ -117,8 +120,8 @@ private: class xsltStylesheet_auto_ptr { public: - explicit xsltStylesheet_auto_ptr(xsltStylesheet *_P = 0) - : _Owns(_P != 0), _Ptr(_P) {} + 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) @@ -153,7 +156,7 @@ private: 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); @@ -283,70 +286,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); @@ -362,75 +301,98 @@ 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(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(params->size()-1); + GdomeDocument *document; + if(param.get_junction()) { // {...} + Temp_lang temp_lang(r, String::UL_XML); + const String& xml=r.process_to_string(param); + + 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(0)), - 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 ? + } + + // URI + const char *URI_cstr; + if(params->size()>1) { // absolute(param) + const String& URI=params->as_string(0, "URI must be string"); + URI_cstr=r.absolute(URI).cstr(); + } else // default = disk path to requested document + URI_cstr=r.info.path_translated; + xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); + if(URI_cstr) + doc->URL=pool.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); // replace any previous parsed source vdoc.set_document(document); @@ -444,17 +406,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); @@ -478,7 +437,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); } @@ -559,7 +518,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, @@ -572,7 +531,7 @@ static void xdoc2buf(Pool& pool, VXdoc& xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); if(!stylesheet.get()) - throw Exception(0, 0, + throw Exception(0, &method_name, "xsltNewStylesheet failed"); @@ -591,8 +550,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.get()); + 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; @@ -604,15 +568,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) { @@ -673,59 +637,41 @@ static void add_xslt_param(const Hash::K 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); - - // 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"); - } - - // stylesheet - 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 - xsltStylesheet *stylesheet=connection->stylesheet(false/*nocache*/); - xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n; + const char ** & current_transform_param=*(const char ***)info; + *current_transform_param++=pool.transcode(aattribute)->str; + *current_transform_param++=pool.transcode(meaning->as_string())->str; +} +static VXdoc& _transform(Pool& pool, const String *doc_source, const String *stylesheet_source, + VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char **transform_params) { + xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(doc_source)); 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/*already quoted-inserted transform_params*/, 0/*const char *output*/, 0/*FILE *profile*/, transformContext.get()); - if(!transformed) - throw Exception(0, 0, - &method_name, - "transform failed. TODO: show errors"); + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception( + 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, - &method_name, + throw Exception(0, + doc_source, "gdome_xml_doc_mkref failed"); VXdoc& result=*new(pool) VXdoc(pool, gdomeDocument); /* grabbing options @@ -756,17 +702,73 @@ static void _transform(Request& r, const oo.standalone=stylesheet->standalone!=0; oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; - // write out result - r.write_no_lang(result); + // return + return result; } +static void _transform(Request& r, const String& method_name, MethodParams *params) { + Pool& pool=r.pool(); + VXdoc& vdoc=*static_cast(r.self); -// constructor + // 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)) { + const char **current_transform_param=transform_params= + (const char **)pool.malloc(sizeof(const char *)*(params->size()*2+1)); + params->for_each(add_xslt_param, ¤t_transform_param); + transform_params[params->size()*2]=0; + } else + throw Exception("parser.runtime", + &method_name, + "transform parameters parameter must be hash"); + } -MXdoc::MXdoc(Pool& apool) : MXnode(apool) { - set_name(*NEW String(pool(), XDOC_CLASS_NAME)); + VXdoc *result; + Value& vmaybe_xdoc=params->get(0); + if(Value *vxdoc=vmaybe_xdoc.as(VXDOC_TYPE, false)) { // stylesheet (xdoc) + xmlDoc *document=gdome_xml_doc_get_xmlDoc( + static_cast(vxdoc)->get_document(&method_name)); + // compile xdoc stylesheet + xsltStylesheet_auto_ptr stylesheet_ptr(xsltParseStylesheetDoc(document)); + // strange thing - xsltParseStylesheetDoc records document and destroys it in stylesheet destructor + // we don't need that + stylesheet_ptr->doc=0; + if(xmlHaveGenericErrors()) { + GdomeException exc=0; + throw Exception(&method_name, exc); + } + if(!stylesheet_ptr.get()) + throw Exception("xml", + &method_name, + "stylesheet failed to compile"); + + // transform! + result=&_transform(pool, &method_name, &method_name, + 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(pool, &method_name, &stylesheet_filespec, + vdoc, connection->stylesheet(false/*nocache*/), + transform_params); + } - /// @test how to create empty type html? + // write out result + r.write_no_lang(*result); +} +// constructor + +/// @test how to create empty type html? +MXdoc::MXdoc(Pool& apool) : MXnode(apool, XDOC_CLASS_NAME, Xnode_class) { /// DOM1 // Element createElement(in DOMString tagName) raises(DOMException); @@ -785,22 +787,23 @@ 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} - 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); @@ -817,8 +820,8 @@ 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); }