--- parser3/src/classes/xdoc.C 2003/03/25 11:11:35 1.108.2.19.2.15 +++ parser3/src/classes/xdoc.C 2003/11/06 09:15:16 1.116 @@ -5,10 +5,19 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -#include "classes.h" +#include "pa_config_includes.h" + #ifdef XML -static const char* IDENT_XDOC_C="$Date: 2003/03/25 11:11:35 $"; +static const char* IDENT_XDOC_C="$Date: 2003/11/06 09:15:16 $"; + +#include "gdome.h" +#include "libxml/tree.h" +#include "libxslt/xsltInternals.h" +#include "libxslt/transform.h" +#include "libxslt/xsltutils.h" +#include "libxslt/variables.h" + #include "pa_vmethod_frame.h" @@ -17,19 +26,9 @@ static const char* IDENT_XDOC_C="$Date: #include "pa_vxdoc.h" #include "pa_charset.h" #include "pa_vfile.h" +#include "pa_xml_exception.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 #define XDOC_CLASS_NAME "xdoc" @@ -162,28 +161,45 @@ private: static void writeNode(Request& r, GdomeNode *node, GdomeException exc) { if(!node || exc) - throw Exception(0, exc); + throw XmlException(0, exc); // write out result r.write_no_lang(*new VXnode(&r.charsets, node)); } // Element createElement(in DOMString tagName) raises(DOMException); -static void _createElement(Request& r, MethodParams* params) { +static void _createElement(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& tagName=params->as_string(0, "tagName must be string"); + const String& tagName=params.as_string(0, "tagName must be string"); GdomeException exc; GdomeNode *node= (GdomeNode *)gdome_doc_createElement(vdoc.get_document(), - r.transcode(tagName).get(), + r.transcode(tagName).use(), + &exc); + writeNode(r, node, exc); +} + +// Element createElementNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); +static void _createElementNS(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + // namespaceURI;localName + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& qualifiedName=params.as_string(1, "qualifiedName must be string"); + + GdomeException exc; + GdomeNode *node= + (GdomeNode *)gdome_doc_createElementNS(vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(qualifiedName).use(), &exc); writeNode(r, node, exc); } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, MethodParams* ) { +static void _createDocumentFragment(Request& r, MethodParams&) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeException exc; @@ -195,134 +211,152 @@ static void _createDocumentFragment(Requ } // Text createTextNode(in DOMString data); -static void _createTextNode(Request& r, MethodParams* params) { +static void _createTextNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createTextNode( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); writeNode(r, node, exc); } // Comment createComment(in DOMString data) -static void _createComment(Request& r, MethodParams* params) { +static void _createComment(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createComment( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); writeNode(r, node, exc); } // CDATASection createCDATASection(in DOMString data) raises(DOMException); -static void _createCDATASection(Request& r, MethodParams* params) { +static void _createCDATASection(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& data=params->as_string(0, "data must be string"); + const String& data=params.as_string(0, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createCDATASection( vdoc.get_document(), - r.transcode(data).get(), + r.transcode(data).use(), &exc); writeNode(r, node, exc); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); -static void _createProcessingInstruction(Request& r, MethodParams* params) { +static void _createProcessingInstruction(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& target=params->as_string(0, "data must be string"); - const String& data=params->as_string(1, "data must be string"); + const String& target=params.as_string(0, "data must be string"); + const String& data=params.as_string(1, "data must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createProcessingInstruction( vdoc.get_document(), - r.transcode(target).get(), - r.transcode(data).get(), + r.transcode(target).use(), + r.transcode(data).use(), &exc); writeNode(r, node, exc); } // Attr createAttribute(in DOMString name) raises(DOMException); -static void _createAttribute(Request& r, MethodParams* params) { +static void _createAttribute(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createAttribute( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc); writeNode(r, node, exc); } + +// Attr createAttributeNS(in DOMString namespaceURI, in DOMString qualifiedName) raises(DOMException); +static void _createAttributeNS(Request& r, MethodParams& params) { + VXdoc& vdoc=GET_SELF(r, VXdoc); + + // namespaceURI;qualifiedName + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& qualifiedName=params.as_string(1, "name must be string"); + + GdomeException exc; + GdomeNode *node=(GdomeNode *)gdome_doc_createAttributeNS( + vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(qualifiedName).use(), + &exc); + writeNode(r, node, exc); +} + // EntityReference createEntityReference(in DOMString name) raises(DOMException); -static void _createEntityReference(Request& r, MethodParams* params) { +static void _createEntityReference(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); GdomeException exc; GdomeNode *node=(GdomeNode *)gdome_doc_createEntityReference( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc); writeNode(r, node, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, MethodParams* params) { +static void _getElementsByTagName(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); VHash& result=*new VHash; GdomeException exc; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagName( vdoc.get_document(), - r.transcode(name).get(), + r.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ias_string(0, "namespaceURI must be string"); - const String& localName=params->as_string(1, "localName must be string"); + const String& namespaceURI=params.as_string(0, "namespaceURI must be string"); + const String& localName=params.as_string(1, "localName must be string"); GdomeException exc; VHash& result=*new VHash; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagNameNS( vdoc.get_document(), - r.transcode(namespaceURI).get(), - r.transcode(localName).get(), + r.transcode(namespaceURI).use(), + r.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); for(gulong i=0; ias_string(0, "elementID must be string"); + const String& elementId=params.as_string(0, "elementID must be string"); GdomeException exc; if(GdomeNode *node=(GdomeNode *)gdome_doc_getElementById( vdoc.get_document(), - r.transcode(elementId).get(), + r.transcode(elementId).use(), &exc)) { // write out result r.write_no_lang(*new VXnode(&r.charsets, node)); } else if(exc || xmlHaveGenericErrors()) - throw Exception( - &elementId, - exc); + throw XmlException(&elementId, exc); } -static void _importNode(Request& r, MethodParams* params) { +static void _importNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeNode *importedNode= as_node(params, 0, "importedNode must be node"); bool deep= - params->as_bool(1, "deep must be bool", r); + params.as_bool(1, "deep must be bool", r); GdomeException exc; GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(), importedNode, deep, &exc); if(exc) - throw Exception(0, exc); + throw XmlException(0, exc); // write out result r.write_no_lang(*new VXnode(&r.charsets, outputNode)); @@ -372,12 +404,13 @@ GdomeElement *gdome_doc_createElementNS GdomeAttr *gdome_doc_createAttributeNS (GdomeDocument *self, GdomeDOMString *namespaceURI, GdomeDOMString *qualifiedName, GdomeException *exc); */ -static void _create(Request& r, MethodParams* params) { +static void _create(Request& r, MethodParams& params) { Charset& source_charset=r.charsets.source(); VXdoc& vdoc=GET_SELF(r, VXdoc); - Value& param=*(*params)[params->count()-1]; + Value& param=params[params.count()-1]; GdomeDocument *document; + bool set_encoding=false; if(param.get_junction()) { // {...} Temp_lang temp_lang(r, String::L_XML); const String& xml=r.process_to_string(param); @@ -387,10 +420,13 @@ static void _create(Request& r, MethodPa gdome_xml_n_mkref((xmlNode *)xmlParseMemory( cstr, strlen(cstr) )); + //printf("document=0x%p\n", document); if(!document || xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(0, exc); + throw XmlException(0, exc); } + + // must be last action in if, see after if} } else { // [name] const String& qualifiedName=param.as_string(); @@ -406,27 +442,32 @@ static void _create(Request& r, MethodPa throw Exception( method_name, exc); + /// +xalan createXMLDecl ? */ document=gdome_di_createDocument (domimpl, 0/*namespaceURI*/, - r.transcode(qualifiedName).get(), + r.transcode(qualifiedName).use(), 0/*doctype*/, &exc); if(!document || exc || xmlHaveGenericErrors()) - throw Exception(0, exc); - - xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); - const char* source_charset_name=source_charset.name().cstr(); - doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name)); + throw XmlException(0, exc); - /// +xalan createXMLDecl ? + set_encoding=true; + // must be last action in if, see after if} + } + // must be first action after if} + // replace any previous parsed source + { + vdoc.set_document(&r.charsets, document); + GdomeException exc; + gdome_doc_unref(document, &exc); } // URI const char* URI_cstr; const char* URI_cstr_ptr; - if(params->count()>1) { // absolute(param) - const String& URI=params->as_string(0, "URI must be string"); + 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; @@ -434,20 +475,21 @@ static void _create(Request& r, MethodPa if(URI_cstr) doc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - // replace any previous parsed source - vdoc.set_document(&r.charsets, document); + if(set_encoding) { + const char* source_charset_name=source_charset.NAME().cstr(); + doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name)); + } } -static void _load(Request& r, MethodParams* params) { - Charset& source_charset=r.charsets.source(); +static void _load(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); // filespec - const String& file_name=params->as_string(0, "uri must be string"); + const String& file_name=params.as_string(0, "uri must be string"); const String& uri=r.absolute(file_name); - File_read_result file=file_read(source_charset, uri, false/*not text*/, - params->count()>1?params->as_no_junction(1, "additional params must be hash") + File_read_result file=file_read(r.charsets, uri, false/*not text*/, + params.count()>1?params.as_no_junction(1, "additional params must be hash") .get_hash() :0); @@ -455,27 +497,33 @@ static void _load(Request& r, MethodPara gdome_xml_n_mkref((xmlNode *)xmlParseMemory(file.str, file.length)); if(!document || xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(&uri, exc); + 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); + } + const char* URI_cstr=uri.cstr(); xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); if(URI_cstr) - doc->URL=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); + doc->URL=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - // replace any previous parsed source - vdoc.set_document(&r.charsets, document); } static void param_option_over_output_option( HashStringValue& param_options, const char* option_name, const String*& output_option) { - if(Value* value=param_options.get(StringBody(option_name))) + if(Value* value=param_options.get(String::Body(option_name))) output_option=&value->as_string(); } static void param_option_over_output_option( HashStringValue& param_options, const char* option_name, bool& output_option) { - if(Value* value=param_options.get(StringBody(option_name))) { + if(Value* value=param_options.get(String::Body(option_name))) { const String& s=value->as_string(); if(s=="yes") output_option=true; @@ -490,7 +538,7 @@ static void param_option_over_output_opt /// @test valid_options check static void prepare_output_options(Request& r, - MethodParams* params, int index, + MethodParams& params, size_t index, VXdoc::Output_options& oo) { /* count()>index) { - Value& voptions=params->as_no_junction(index, "options must be string"); + if(params.count()>index) { + Value& voptions=params.as_no_junction(index, "options must be string"); if(voptions.is_defined()) { if(HashStringValue *options=voptions.get_hash()) { // $.method[xml|html|text] - if(Value* vmethod=options->get(StringBody(XDOC_OUTPUT_METHOD_OPTION_NAME))) + if(Value* vmethod=options->get(String::Body(XDOC_OUTPUT_METHOD_OPTION_NAME))) oo.method=&vmethod->as_string(); // $.version[1.0] @@ -537,7 +585,7 @@ static void prepare_output_options(Reque // default encoding from pool if(!oo.encoding) - oo.encoding=&r.charsets.source().name(); + 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); @@ -557,7 +605,7 @@ struct Xdoc2buf_result { size_t length; }; static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, - MethodParams* params, int index, + MethodParams& params, int index, VXdoc::Output_options& oo, const String* file_spec) { Xdoc2buf_result result; @@ -585,7 +633,7 @@ static Xdoc2buf_result xdoc2buf(Request& "xsltNewStylesheet failed"); #define OOS2STYLE(name) \ - stylesheet->name=oo.name?BAD_CAST g_strdup(r.transcode(*oo.name)->str):0 + stylesheet->name=oo.name?BAD_CAST xmlMemStrdup(r.transcode(*oo.name)->str):0 #define OOE2STYLE(name) \ stylesheet->name=oo.name @@ -602,7 +650,7 @@ static Xdoc2buf_result xdoc2buf(Request& xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document()); if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) { GdomeException exc=0; - throw Exception(0, exc); + throw XmlException(0, exc); } // write out result @@ -614,6 +662,7 @@ static Xdoc2buf_result xdoc2buf(Request& gnome_length=outputBuffer->buffer->use; gnome_str=(char *)outputBuffer->buffer->content; } + if(file_spec) file_write(*file_spec, gnome_str, gnome_length, @@ -626,7 +675,7 @@ static Xdoc2buf_result xdoc2buf(Request& return result; } -static void _file(Request& r, MethodParams* params) { +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, @@ -642,7 +691,7 @@ static void _file(Request& r, MethodPara value_name, new VString(*oo.mediaType)); vhcontent_type.hash().put( - StringBody("charset"), + String::Body("charset"), new VString(*oo.encoding)); vfile.set(false/*tainted*/, buf.str?buf.str:""/*to distinguish from stat-ed file*/, buf.length, @@ -650,10 +699,10 @@ static void _file(Request& r, MethodPara r.write_no_lang(vfile); } -static void _save(Request& r, MethodParams* params) { +static void _save(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - const String& file_spec=r.absolute(params->as_string(0, "file name must be string")); + 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, @@ -661,7 +710,7 @@ static void _save(Request& r, MethodPara &file_spec); } -static void _string(Request& r, MethodParams* params) { +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, @@ -692,7 +741,7 @@ static VXdoc& _transform(Request& r, con xsltTransformContext_auto_ptr transformContext( xsltNewTransformContext(stylesheet, document)); // make params literal - if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext + if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext transformContext->globalVars = xmlHashCreate(20); xsltQuoteUserParams(transformContext.get(), transform_params); // do transform @@ -705,7 +754,7 @@ static VXdoc& _transform(Request& r, con transformContext.get()); if(!transformed || xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(stylesheet_source, exc); + throw XmlException(stylesheet_source, exc); } //gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE type, fixing @@ -747,24 +796,24 @@ static VXdoc& _transform(Request& r, con // return return result; } -static void _transform(Request& r, MethodParams* params) { +static void _transform(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); // params Array transform_strings; const char** transform_params=0; - if(params->count()>1) { - Value& vparams=params->as_no_junction(1, "transform parameters must be hash"); + if(params.count()>1) { + Value& vparams=params.as_no_junction(1, "transform parameters must be hash"); if(!vparams.is_string()) - if(HashStringValue* params=vparams.get_hash()) { - transform_params=new(UseGC) const char*[params->count()*2+1]; + 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 }; - params->for_each(add_xslt_param, &info); - transform_params[params->count()*2]=0; + hash->for_each(add_xslt_param, &info); + transform_params[hash->count()*2]=0; } else throw Exception("parser.runtime", 0, @@ -772,8 +821,7 @@ static void _transform(Request& r, Metho } VXdoc* result; - Value* vmaybe_xdoc=(*params)[0]; - if(Value *vxdoc=vmaybe_xdoc->as(VXDOC_TYPE, false)) { // stylesheet (xdoc) + 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 @@ -783,7 +831,7 @@ static void _transform(Request& r, Metho stylesheet_ptr->doc=0; if(xmlHaveGenericErrors()) { GdomeException exc=0; - throw Exception(0, exc); + throw XmlException(0, exc); } if(!stylesheet_ptr.get()) throw Exception("xml", @@ -797,7 +845,7 @@ static void _transform(Request& r, Metho } 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)")); + 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] @@ -844,6 +892,12 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, // 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); @@ -882,6 +936,8 @@ void MXdoc::configure_admin(Request& r) # else +#include "classes.h" + // global variable DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive