--- parser3/src/classes/xdoc.C 2003/11/06 08:22:48 1.115 +++ parser3/src/classes/xdoc.C 2003/12/10 14:17:43 1.124 @@ -9,7 +9,7 @@ #ifdef XML -static const char* IDENT_XDOC_C="$Date: 2003/11/06 08:22:48 $"; +static const char * const IDENT_XDOC_C="$Date: 2003/12/10 14:17:43 $"; #include "gdome.h" #include "libxml/tree.h" @@ -42,13 +42,11 @@ static const char* IDENT_XDOC_C="$Date: class MXdoc: public MXnode { public: // VStateless_class - Value* create_new_value() { return 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 @@ -332,7 +330,7 @@ static void _getElementsByTagName(Reques String::Body::Format(i), new VXnode(&r.charsets, gdome_nl_item(nodes, i, &exc))); } else if(exc) - throw Exception(0, exc); + throw XmlException(0, exc); // write out result r.write_no_lang(result); @@ -378,9 +376,7 @@ static void _getElementById(Request& r, // 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) { @@ -396,7 +392,7 @@ static void _importNode(Request& r, Meth 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)); @@ -425,7 +421,7 @@ static void _create(Request& r, MethodPa //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} @@ -433,26 +429,26 @@ static void _create(Request& r, MethodPa 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); /// +xalan createXMLDecl ? - */ - document=gdome_di_createDocument (domimpl, +#endif + document=gdome_di_createDocument(domimpl, 0/*namespaceURI*/, r.transcode(qualifiedName).use(), 0/*doctype*/, &exc); if(!document || exc || xmlHaveGenericErrors()) - throw Exception(0, exc); + throw XmlException(0, exc); set_encoding=true; // must be last action in if, see after if} @@ -487,19 +483,19 @@ static void _load(Request& r, MethodPara VXdoc& vdoc=GET_SELF(r, VXdoc); // filespec - 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(r.charsets, uri, false/*not text*/, - params.count()>1?params.as_no_junction(1, "additional params must be hash") - .get_hash() - :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.str, file.length)); + 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 @@ -508,12 +504,12 @@ static void _load(Request& r, MethodPara GdomeException exc; gdome_doc_unref(document, &exc); } - - const char* 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=r.charsets.source().transcode_buf2xchar(URI_cstr, strlen(URI_cstr)); - +*/ } static void param_option_over_output_option( @@ -573,10 +569,6 @@ static void prepare_output_options(Reque param_option_over_output_option(*options, "omit-xml-declaration", oo.omitXmlDeclaration); // $.standalone[yes|no] param_option_over_output_option(*options, "standalone", oo.standalone); - // $.doctype-public[?] - param_option_over_output_option(*options, "doctype-public", oo.doctypePublic); - // $.doctype-system[?] - param_option_over_output_option(*options, "doctype-system", oo.doctypeSystem); // $.indent[yes|no] param_option_over_output_option(*options, "indent", oo.indent); // $.media-type[text/{html|xml|plain}] @@ -642,8 +634,8 @@ static Xdoc2buf_result xdoc2buf(Request& OOS2STYLE(method); OOS2STYLE(encoding); OOS2STYLE(mediaType); - OOS2STYLE(doctypeSystem); - OOS2STYLE(doctypePublic); +// OOS2STYLE(doctypeSystem); + //OOS2STYLE(doctypePublic); OOE2STYLE(indent); OOS2STYLE(version); OOE2STYLE(standalone); @@ -652,7 +644,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 @@ -665,14 +657,15 @@ static Xdoc2buf_result xdoc2buf(Request& gnome_str=(char *)outputBuffer->buffer->content; } + if((result.length=gnome_length)) { + result.str=pa_strdup(gnome_str, gnome_length); + } else + result.str=0; + if(file_spec) file_write(*file_spec, gnome_str, gnome_length, true/*as_text*/); - else if(result.length=gnome_length) { - result.str=pa_strdup(gnome_str, gnome_length); - } else - result.str=0; return result; } @@ -756,7 +749,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 @@ -788,8 +781,6 @@ static VXdoc& _transform(Request& r, con 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.doctypeSystem=stylesheet->doctypeSystem?&r.transcode(stylesheet->doctypeSystem):0; - oo.doctypePublic=stylesheet->doctypePublic?&r.transcode(stylesheet->doctypePublic):0; oo.indent=stylesheet->indent!=0; oo.version=stylesheet->version?&r.transcode(stylesheet->version):0; oo.standalone=stylesheet->standalone!=0; @@ -833,7 +824,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", @@ -852,8 +843,7 @@ static void _transform(Request& r, Metho // load and compile file to stylesheet [or get cached if any] // transform! - result=&_transform(r, &stylesheet_filespec, - vdoc, connection->stylesheet(false/*nocache*/), + result=&_transform(r, &stylesheet_filespec, vdoc, connection->stylesheet(), transform_params); } @@ -913,7 +903,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] @@ -933,9 +923,6 @@ MXdoc::MXdoc(): MXnode(XDOC_CLASS_NAME, } -void MXdoc::configure_admin(Request& r) { -} - # else #include "classes.h" @@ -945,4 +932,3 @@ void MXdoc::configure_admin(Request& r) DECLARE_CLASS_VAR(xdoc, 0, 0); // fictive #endif -