--- parser3/src/classes/xdoc.C 2002/01/16 10:28:34 1.65 +++ parser3/src/classes/xdoc.C 2002/01/28 08:20:33 1.78 @@ -4,11 +4,21 @@ 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 $ + $Id: xdoc.C,v 1.78 2002/01/28 08:20:33 paf Exp $ */ #include "pa_types.h" #ifdef XML +#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 "pa_stylesheet_connection.h" #include "classes.h" #include "pa_request.h" @@ -17,12 +27,6 @@ #include "pa_vfile.h" #include "xnode.h" -extern "C" { -#include "gdomecore/gdome-xml-node.h" -#include "gdomecore/gdome-xml-document.h" -}; -#include "libxslt/transform.h" -#include "libxslt/xsltutils.h" // defines @@ -51,8 +55,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 +88,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 +121,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) @@ -362,7 +366,7 @@ static void _getElementById(Request& r, // write out result VXnode& result=*new(pool) VXnode(pool, node); r.write_no_lang(result); - } else if(exc) + } else if(exc || xmlHaveGenericErrors()) throw Exception(0, 0, &method_name, exc); @@ -389,7 +393,7 @@ static void _create(Request& r, const St 0/*publicId* /, 0/*systemId* /, &exc); - if(!documentType || exc) + if(!documentType || exc || xmlHaveGenericErrors()) throw Exception(0, 0, &method_name, exc); @@ -399,7 +403,7 @@ static void _create(Request& r, const St pool.transcode(qualifiedName).get(), 0/*doctype*/, &exc); - if(!document || exc) + if(!document || exc || xmlHaveGenericErrors()) throw Exception(0, 0, &method_name, exc); @@ -410,7 +414,6 @@ static void _create(Request& r, const St vdoc.set_document(document); } -/// @test xmlSAXParseMemory(NULL<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) + GdomeDocument *document=(GdomeDocument *) + gdome_xml_n_mkref((xmlNode *)xmlParseFile(uri.cstr())); + if(!document || xmlHaveGenericErrors()) { + GdomeException exc=0; throw Exception(0, 0, - &method_name, + &uri, exc); + } // replace any previous parsed source vdoc.set_document(document); @@ -591,8 +591,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(0, 0, + &method_name, + exc); + } // write out result char *gnome_buf; size_t gnome_size; @@ -604,15 +609,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) { @@ -704,7 +709,7 @@ static void _transform(Request& r, const // transform xsltStylesheet *stylesheet=connection->stylesheet(false/*nocache*/); - xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n; + xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document(&method_name)); xsltTransformContext_auto_ptr transformContext( xsltNewTransformContext(stylesheet, document)); xmlDoc *transformed=xsltApplyStylesheetUser( @@ -714,10 +719,12 @@ static void _transform(Request& r, const 0/*const char *output*/, 0/*FILE *profile*/, transformContext.get()); - if(!transformed) + if(!transformed || xmlHaveGenericErrors()) { + GdomeException exc=0; throw Exception(0, 0, - &method_name, - "transform failed. TODO: show errors"); + &stylesheet_filespec, + exc); + } //gdome_xml_doc_mkref dislikes XML_HTML_DOCUMENT_NODE type, fixing transformed->type=XML_DOCUMENT_NODE;