--- parser3/src/classes/xdoc.C 2002/01/24 15:06:45 1.75 +++ parser3/src/classes/xdoc.C 2002/01/28 08:20:33 1.78 @@ -4,7 +4,7 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://paf.design.ru) - $Id: xdoc.C,v 1.75 2002/01/24 15:06:45 paf Exp $ + $Id: xdoc.C,v 1.78 2002/01/28 08:20:33 paf Exp $ */ #include "pa_types.h" #ifdef XML @@ -423,9 +423,10 @@ static void _set(Request& r, const Strin Temp_lang temp_lang(r, String::UL_XML); const String& xml=r.process(vxml).as_string(); + const char *cstr=xml.cstr(String::UL_UNSPECIFIED); GdomeDocument *document=(GdomeDocument *) gdome_xml_n_mkref((xmlNode *)xmlParseMemory( - xml.cstr(String::UL_AS_IS), xml.size() + cstr, strlen(cstr) )); if(!document || xmlHaveGenericErrors()) { GdomeException exc=0; @@ -590,7 +591,7 @@ static void xdoc2buf(Pool& pool, VXdoc& OOE2STYLE(standalone); OOE2STYLE(omitXmlDeclaration); - xmlDoc *document=((Gdome_xml_Document*)vdoc.get_document(&method_name))->n; + 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, @@ -608,7 +609,7 @@ 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*/); @@ -708,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(