--- parser3/src/classes/xdoc.C 2003/03/07 09:24:36 1.108.2.15 +++ parser3/src/classes/xdoc.C 2004/01/30 14:35:11 1.129 @@ -5,31 +5,30 @@ 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/07 09:24:36 $"; +static const char * const IDENT_XDOC_C="$Date: 2004/01/30 14:35:11 $"; + +#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" -#include "pa_stylesheet_connection.h" +#include "pa_stylesheet_manager.h" #include "pa_request.h" #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" @@ -43,13 +42,11 @@ extern "C" { class MXdoc: public MXnode { public: // VStateless_class - ValuePtr create_new_value() { return ValuePtr(new VXdoc(0, 0)); } + Value* create_new_value(Pool&) { return new VXdoc(0, 0); } public: MXdoc(); -public: // Methoded - void configure_admin(Request& r); }; // global variable @@ -159,375 +156,388 @@ private: // methods -static void writeNode(Request& r, StringPtr method_name, GdomeNode *node, +static void writeNode(Request& r, GdomeNode *node, GdomeException exc) { if(!node || exc) - throw Exception( - method_name, - exc); - - Pool& pool=r.pool(); + throw XmlException(0, exc); // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, node))); + r.write_no_lang(*new VXnode(&r.charsets, node)); } // Element createElement(in DOMString tagName) raises(DOMException); -static void _createElement(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +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, 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); - StringPtr tagName=params->as_string(0, "tagName must be string"); + // 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_createElement(vdoc.get_document(method_name), - r.transcode(tagName).get(), + (GdomeNode *)gdome_doc_createElementNS(vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(qualifiedName).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // DocumentFragment createDocumentFragment() -static void _createDocumentFragment(Request& r, StringPtr method_name, MethodParams* ) { - Pool& pool=r.pool(); +static void _createDocumentFragment(Request& r, MethodParams&) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeException exc; GdomeNode *node= (GdomeNode *)gdome_doc_createDocumentFragment( - vdoc.get_document(method_name), + vdoc.get_document(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Text createTextNode(in DOMString data); -static void _createTextNode(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createTextNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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(method_name), - r.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Comment createComment(in DOMString data) -static void _createComment(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createComment(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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(method_name), - r.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // CDATASection createCDATASection(in DOMString data) raises(DOMException); -static void _createCDATASection(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createCDATASection(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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(method_name), - r.transcode(data).get(), + vdoc.get_document(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // ProcessingInstruction createProcessingInstruction(in DOMString target,in DOMString data) raises(DOMException); -static void _createProcessingInstruction(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createProcessingInstruction(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr target=params->as_string(0, "data must be string"); - StringPtr 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(method_name), - r.transcode(target).get(), - r.transcode(data).get(), + vdoc.get_document(), + r.transcode(target).use(), + r.transcode(data).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // Attr createAttribute(in DOMString name) raises(DOMException); -static void _createAttribute(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createAttribute(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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(method_name), - r.transcode(name).get(), + vdoc.get_document(), + 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, method_name, node, exc); + writeNode(r, node, exc); } + // EntityReference createEntityReference(in DOMString name) raises(DOMException); -static void _createEntityReference(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _createEntityReference(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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(method_name), - r.transcode(name).get(), + vdoc.get_document(), + r.transcode(name).use(), &exc); - writeNode(r, method_name, node, exc); + writeNode(r, node, exc); } // NodeList getElementsByTagName(in DOMString name); -static void _getElementsByTagName(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _getElementsByTagName(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr name=params->as_string(0, "name must be string"); + const String& name=params.as_string(0, "name must be string"); - VHashPtr result(new VHash); + VHash& result=*new VHash; GdomeException exc; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagName( - vdoc.get_document(method_name), - r.transcode(name).get(), + vdoc.get_document(), + r.transcode(name).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; ihash(Exception::undefined_source).put( - skey, - ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &exc)))); - } + for(gulong i=0; ias_string(0, "namespaceURI must be string"); - StringPtr 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; - VHashPtr result(new VHash); + VHash& result=*new VHash; if(GdomeNodeList *nodes= gdome_doc_getElementsByTagNameNS( - vdoc.get_document(method_name), - r.transcode(namespaceURI).get(), - r.transcode(localName).get(), + vdoc.get_document(), + r.transcode(namespaceURI).use(), + r.transcode(localName).use(), &exc)) { gulong length=gdome_nl_length(nodes, &exc); - for(gulong i=0; ihash(Exception::undefined_source).put( - skey, - ValuePtr(new VXnode(&pool, gdome_nl_item(nodes, i, &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(method_name), - r.transcode(elementId).get(), + vdoc.get_document(), + r.transcode(elementId).use(), &exc)) { // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, node))); + r.write_no_lang(*new VXnode(&r.charsets, node)); } else if(exc || xmlHaveGenericErrors()) - throw Exception( - method_name, - exc); + throw XmlException(&elementId, exc); } -static void _importNode(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _importNode(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); GdomeNode *importedNode= - as_node(method_name, params, 0, "importedNode must be node"); + 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(method_name), + GdomeNode *outputNode=gdome_doc_importNode(vdoc.get_document(), importedNode, deep, &exc); if(exc) - throw Exception( - method_name, - exc); + throw XmlException(0, exc); // write out result - r.write_no_lang(ValuePtr(new VXnode(&pool, outputNode))); + r.write_no_lang(*new VXnode(&r.charsets, 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); */ -static void _create(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _create(Request& r, MethodParams& params) { Charset& source_charset=r.charsets.source(); VXdoc& vdoc=GET_SELF(r, VXdoc); - ValuePtr param=(*params)[params->count()-1]; + Value& param=params[params.count()-1]; GdomeDocument *document; - if(param->get_junction()) { // {...} - Temp_lang temp_lang(r, String::UL_XML); - StringPtr xml=r.process_to_string(param); + bool set_encoding=false; + if(param.get_junction()) { // {...} + Temp_lang temp_lang(r, String::L_XML); + const String& xml=r.process_to_string(param); - CharPtr cstr=xml->cstr(String::UL_UNSPECIFIED); + 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 Exception( - method_name, - exc); + throw XmlException(0, exc); } + + // must be last action in if, see after if} } else { // [name] - StringPtr qualifiedName=param->as_string(&pool); + const String& qualifiedName=param.as_string(); GdomeException exc; - /* +#if 0 GdomeDocumentType *documentType=gdome_di_createDocumentType ( docimpl, r.transcode(qualifiedName), - 0/*publicId* /, - 0/*systemId* /, + 0/*publicId*/, + 0/*systemId*/, &exc); if(!documentType || exc || xmlHaveGenericErrors()) throw Exception( method_name, exc); - */ - document=gdome_di_createDocument (domimpl, + /// +xalan createXMLDecl ? +#endif + document=gdome_di_createDocument(domimpl, 0/*namespaceURI*/, - r.transcode(qualifiedName).get(), + r.transcode(qualifiedName).use(), 0/*doctype*/, &exc); if(!document || exc || xmlHaveGenericErrors()) - throw Exception( - method_name, - exc); + throw XmlException(0, exc); - xmlDoc *doc=gdome_xml_doc_get_xmlDoc(document); - CharPtr source_charset_name=source_charset.name()->cstr(); - doc->encoding=source_charset.transcode_buf2xchar(source_charset_name, strlen(source_charset_name)); - - /// +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; - CharPtr URI_cstr_ptr; - if(params->count()>1) { // absolute(param) - StringPtr URI=params->as_string(0, "URI must be string"); - URI_cstr=URI_cstr_ptr=r.absolute(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)); - // replace any previous parsed source - vdoc.set_document(&pool, 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, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); - Charset& source_charset=r.charsets.source(); +static void _load(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); // filespec - StringPtr file_name=params->as_string(0, "uri must be string"); - StringPtr uri=r.absolute(file_name); - - void *data; size_t size; - File_read_result file=file_read(pool, source_charset, uri, false/*not text*/, - params->count()>1?params->as_no_junction(1, "additional params must be hash") - ->get_hash(method_name) - :0); + 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 *)xmlParseMemory(file.data, file.size)); + gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri_cstr)); 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); } - CharPtr URI_cstr=uri->cstr(); +/* 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=source_charset.transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - - // replace any previous parsed source - vdoc.set_document(&pool, document); + doc->URL=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); +*/ } -static void param_option_over_output_option(Pool& pool, - HashStringValue& param_options, const char* option_name, - StringPtr& output_option) { - if(ValuePtr value=param_options.get(StringPtr(new String(option_name)))) - output_option=value->as_string(&pool); -} -static void param_option_over_output_option(Pool& pool, - HashStringValue& param_options, const char* option_name, - bool& output_option) { - if(ValuePtr value=param_options.get(StringPtr(new String(option_name)))) { - StringPtr s=value->as_string(&pool); - if(*s=="yes") +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, + bool& output_option) { + if(Value* value=param_options.get(String::Body(option_name))) { + const String& s=value->as_string(); + if(s=="yes") output_option=true; - else if(*s=="no") + else if(s=="no") output_option=false; else throw Exception("parser.runtime", - s, + &s, "%s must be either 'yes' or 'no'", option_name); } } /// @test valid_options check static void prepare_output_options(Request& r, - StringPtr method_name, MethodParams* params, int index, - VXdoc::Output_options& oo) { - Pool& pool=r.pool(); + MethodParams& params, size_t index, + VXdoc::Output_options& oo) { /* count()>index) { - ValuePtr voptions=params->as_no_junction(index, "options must be string"); - if(voptions->is_defined()) { - if(HashStringValue *options=voptions->get_hash(method_name)) { + 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(ValuePtr vmethod=options->get(StringPtr(new String(XDOC_OUTPUT_METHOD_OPTION_NAME)))) - oo.method=vmethod->as_string(&pool); + 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(pool, *options, "version", oo.version); + param_option_over_output_option(*options, "version", oo.version); // $.encoding[windows-1251|...] - param_option_over_output_option(pool, *options, "encoding", oo.encoding); + param_option_over_output_option(*options, "encoding", oo.encoding); // $.omit-xml-declaration[yes|no] - param_option_over_output_option(pool, *options, "omit-xml-declaration", oo.omitXmlDeclaration); + param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration); // $.standalone[yes|no] - param_option_over_output_option(pool, *options, "standalone", oo.standalone); - // $.doctype-public[?] - param_option_over_output_option(pool, *options, "doctype-public", oo.doctypePublic); - // $.doctype-system[?] - param_option_over_output_option(pool, *options, "doctype-system", oo.doctypeSystem); + param_option_over_output_option(*options, "standalone", oo.standalone); // $.indent[yes|no] - param_option_over_output_option(pool, *options, "indent", oo.indent); + param_option_over_output_option(*options, "indent", oo.indent); // $.media-type[text/{html|xml|plain}] - param_option_over_output_option(pool, *options, "media-type", oo.mediaType); + param_option_over_output_option(*options, "media-type", oo.mediaType); } } } // 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=StringPtr(new String(XDOC_OUTPUT_METHOD_OPTION_VALUE_XML)); + 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=StringPtr(new String("text/xml")); + oo.mediaType=new String("text/xml"); else if(*oo.method==XDOC_OUTPUT_METHOD_OPTION_VALUE_HTML) - oo.mediaType=StringPtr(new String("text/html")); + oo.mediaType=new String("text/html"); else // XDOC_OUTPUT_METHOD_OPTION_VALUE_TEXT & all others - oo.mediaType=StringPtr(new String("text/plain")); + oo.mediaType=new String("text/plain"); } } struct Xdoc2buf_result { - char* ptr; - size_t size; + char* str; + size_t length; }; static Xdoc2buf_result xdoc2buf(Request& r, VXdoc& vdoc, - StringPtr method_name, MethodParams* params, int index, + MethodParams& params, int index, VXdoc::Output_options& oo, - StringPtr file_spec) { + const String* file_spec) { Xdoc2buf_result result; - Pool& pool=r.pool(); - prepare_output_options(r, method_name, params, index, + prepare_output_options(r, params, index, oo); - CharPtr encoding_cstr=oo.encoding->cstr(); + const char* encoding_cstr=oo.encoding->cstr(); xmlCharEncodingHandler *encoder=xmlFindCharEncodingHandler(encoding_cstr); if(!encoder) throw Exception("parser.runtime", - method_name, - "encoding '%s' not supported", encoding_cstr.get()); + 0, + "encoding '%s' not supported", encoding_cstr); // UTF-8 encoder contains empty input/output converters, // which is wrong for xmlOutputBufferCreateIO // while zero encoder goes perfectly @@ -618,124 +623,122 @@ static Xdoc2buf_result xdoc2buf(Request& xsltStylesheet_auto_ptr stylesheet(xsltNewStylesheet()); if(!stylesheet.get()) throw Exception(0, - method_name, + 0, "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 OOS2STYLE(method); OOS2STYLE(encoding); OOS2STYLE(mediaType); - OOS2STYLE(doctypeSystem); - OOS2STYLE(doctypePublic); +// OOS2STYLE(doctypeSystem); + //OOS2STYLE(doctypePublic); OOE2STYLE(indent); OOS2STYLE(version); OOE2STYLE(standalone); OOE2STYLE(omitXmlDeclaration); - xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(method_name)); + xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document()); + if(encoder) + document->encoding=BAD_CAST xmlMemStrdup(encoder->name); if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) { GdomeException exc=0; - throw Exception( - method_name, - exc); + throw XmlException(0, exc); } // write out result - char *gnome_buf; size_t gnome_size; + char *gnome_str; size_t gnome_length; if(outputBuffer->conv) { - gnome_size=outputBuffer->conv->use; - gnome_buf=(char *)outputBuffer->conv->content; + gnome_length=outputBuffer->conv->use; + gnome_str=(char *)outputBuffer->conv->content; } else { - gnome_size=outputBuffer->buffer->use; - gnome_buf=(char *)outputBuffer->buffer->content; + gnome_length=outputBuffer->buffer->use; + gnome_str=(char *)outputBuffer->buffer->content; } - if(file_spec) - file_write(file_spec, - gnome_buf, gnome_size, - true/*as_text*/); - else if(result.size=gnome_size) { - result.ptr=pool.copy(gnome_buf, gnome_size); + + if((result.length=gnome_length)) { + result.str=pa_strdup(gnome_str, gnome_length); } else - result.ptr=0; + result.str=0; + + if(file_spec) + file_write(*file_spec, + gnome_str, gnome_length, + true/*as_text*/); return result; } -static void _file(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +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, method_name, params, 0, + Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, oo, - StringPtr(0)/*not to file, to memory*/); + 0/*not to file, to memory*/); // write out result - r.write_no_lang(String(buf.ptr, buf.size)); + r.write_no_lang(String(buf.str, buf.length)); // write out result - VFilePtr vfile(new VFile); - ValuePtr vcontent_type; - VHashPtr vhcontent_type(new VHash); - vhcontent_type->hash(method_name).put( + VFile& vfile=*new VFile; + VHash& vhcontent_type=*new VHash; + vhcontent_type.hash().put( value_name, - ValuePtr(new VString(oo.mediaType))); - vhcontent_type->hash(method_name).put( - StringPtr(new String("charset")), - ValuePtr(new VString(oo.encoding))); - vcontent_type=vhcontent_type; + new VString(*oo.mediaType)); + vhcontent_type.hash().put( + String::Body("charset"), + new VString(*oo.encoding)); - vfile->set(pool, false/*tainted*/, buf.ptr?buf.ptr:""/*to distinguish from stat-ed file*/, buf.size, - 0/*file_name*/, vcontent_type); + 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 _save(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _save(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); - StringPtr 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, method_name, params, 1, + xdoc2buf(r, vdoc, params, 1, oo, - file_spec); + &file_spec); } -static void _string(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +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, method_name, params, 0, + Xdoc2buf_result buf=xdoc2buf(r, vdoc, params, 0, oo, - StringPtr(0)/*not to file, to memory*/); + 0/*not to file, to memory*/); // write out result - r.write_no_lang(String(buf.ptr, buf.size)); + r.write_no_lang(String(buf.str, buf.length)); } #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) { - *info->current_transform_param++=info->r->transcode(attribute)->str; - *info->current_transform_param++=info->r->transcode(meaning->as_string(&info->r->pool()))->str; + 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 VXdocPtr _transform(Request& r, StringPtr doc_source, StringPtr stylesheet_source, +static VXdoc& _transform(Request& r, const String* stylesheet_source, VXdoc& vdoc, xsltStylesheetPtr stylesheet, const char** transform_params) { - Pool& pool=r.pool(); - xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(doc_source)); + 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 + if (transformContext->globalVars == NULL) // strangly not initialized by xsltNewTransformContext transformContext->globalVars = xmlHashCreate(20); xsltQuoteUserParams(transformContext.get(), transform_params); // do transform @@ -748,9 +751,7 @@ static VXdocPtr _transform(Request& r, S 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 @@ -759,9 +760,9 @@ static VXdocPtr _transform(Request& r, S GdomeDocument *gdomeDocument=gdome_xml_doc_mkref(transformed); if(!gdomeDocument) throw Exception(0, - doc_source, + 0, "gdome_xml_doc_mkref failed"); - VXdocPtr result(new VXdoc(&pool, gdomeDocument)); + VXdoc& result=*new VXdoc(&r.charsets, gdomeDocument); /* grabbing options */ - VXdoc::Output_options& oo=result->output_options; + VXdoc::Output_options& oo=result.output_options; - Charset& source_charset=r.charsets.source(); - oo.method=stylesheet->method?source_charset.transcode(stylesheet->method, stylesheet_source):StringPtr(0); - oo.encoding=stylesheet->encoding?source_charset.transcode(stylesheet->encoding, stylesheet_source):StringPtr(0); - oo.mediaType=stylesheet->mediaType?source_charset.transcode(stylesheet->mediaType, stylesheet_source):StringPtr(0); - oo.doctypeSystem=stylesheet->doctypeSystem?source_charset.transcode(stylesheet->doctypeSystem, stylesheet_source):StringPtr(0); - oo.doctypePublic=stylesheet->doctypePublic?source_charset.transcode(stylesheet->doctypePublic, stylesheet_source):StringPtr(0); + 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!=0; - oo.version=stylesheet->version?source_charset.transcode(stylesheet->version, stylesheet_source):StringPtr(0); + oo.version=stylesheet->version?&r.transcode(stylesheet->version):0; oo.standalone=stylesheet->standalone!=0; oo.omitXmlDeclaration=stylesheet->omitXmlDeclaration!=0; // return return result; } -static void _transform(Request& r, StringPtr method_name, MethodParams* params) { - Pool& pool=r.pool(); +static void _transform(Request& r, MethodParams& params) { VXdoc& vdoc=GET_SELF(r, VXdoc); // params - smart_ptr transform_params; - if(params->count()>1) { - ValuePtr vparams=params->as_no_junction(1, "transform parameters must be hash"); - if(!vparams->is_string()) - if(HashStringValue* params=vparams->get_hash(method_name)) { - transform_params=smart_ptr(new const char*[params->count()*2+1]); + 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 }; - 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", - method_name, + 0, "transform parameters parameter must be hash"); } - VXdocPtr result; - ValuePtr vmaybe_xdoc=(*params)[0]; - if(Value *vxdoc=vmaybe_xdoc->as(VXDOC_TYPE, false)) { // stylesheet (xdoc) + 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(method_name)); + static_cast(vxdoc)->get_document()); // 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); + throw XmlException(0, exc); } if(!stylesheet_ptr.get()) throw Exception("xml", - method_name, + 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, method_name, method_name, + result=&_transform(r, 0, vdoc, stylesheet_ptr.get(), transform_params); } else { // stylesheet (file name) // extablish stylesheet connection - StringPtr stylesheet_filespec= - r.absolute(params->as_string(0, "stylesheet must be file name (string) or DOM document (xdoc)")); - Stylesheet_connectionPtr connection=stylesheet_manager.get_connection(stylesheet_filespec); + 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, method_name, stylesheet_filespec, - vdoc, connection->stylesheet(false/*nocache*/), + result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(), transform_params); } // write out result - r.write_no_lang(result); + r.write_no_lang(*result); } // constructor /// @test how to create empty type html? -MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, xnode_class.get()) { +MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, xnode_class) { /// DOM1 // Element createElement(in DOMString tagName) raises(DOMException); @@ -889,6 +886,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); @@ -902,7 +905,7 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, add_native_method("set", Method::CT_DYNAMIC, _create, 1, 1); // ^xdoc::load[some.xml] - add_native_method("load", Method::CT_DYNAMIC, _load, 1, 2); + add_native_method("load", Method::CT_DYNAMIC, _load, 1, 1); // ^xdoc.save[some.xml] // ^xdoc.save[some.xml;options hash] @@ -922,10 +925,12 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, } -void MXdoc::configure_admin(Request& r) { -} - # else -#endif +#include "classes.h" + +// global variable +DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive + +#endif