--- parser3/src/classes/xdoc.C 2004/01/30 14:35:11 1.129 +++ parser3/src/classes/xdoc.C 2004/02/11 15:33:13 1.131 @@ -1,7 +1,7 @@ /** @file Parser: @b xdoc parser class. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,7 +9,7 @@ #ifdef XML -static const char * const IDENT_XDOC_C="$Date: 2004/01/30 14:35:11 $"; +static const char * const IDENT_XDOC_C="$Date: 2004/02/11 15:33:13 $"; #include "gdome.h" #include "libxml/tree.h" @@ -615,7 +615,8 @@ static Xdoc2buf_result xdoc2buf(Request& // UTF-8 encoder contains empty input/output converters, // which is wrong for xmlOutputBufferCreateIO // while zero encoder goes perfectly - if(encoder && strcmp(encoder->name, "UTF-8")==0) + const char* encoder_name=encoder->name; + if(strcmp(encoder_name, "UTF-8")==0) encoder=0; xmlOutputBuffer_auto_ptr outputBuffer(xmlAllocOutputBuffer(encoder)); @@ -635,15 +636,14 @@ static Xdoc2buf_result xdoc2buf(Request& OOS2STYLE(encoding); OOS2STYLE(mediaType); // OOS2STYLE(doctypeSystem); - //OOS2STYLE(doctypePublic); +// OOS2STYLE(doctypePublic); OOE2STYLE(indent); OOS2STYLE(version); OOE2STYLE(standalone); OOE2STYLE(omitXmlDeclaration); xmlDoc *document=gdome_xml_doc_get_xmlDoc(vdoc.get_document()); - if(encoder) - document->encoding=BAD_CAST xmlMemStrdup(encoder->name); + document->encoding=BAD_CAST xmlMemStrdup(encoder_name); if(xsltSaveResultTo(outputBuffer.get(), document, stylesheet.get())<0) { GdomeException exc=0; throw XmlException(0, exc);