[patch] xerces-c patch

glest-3.2.2-xerces-c.patch (text/plain), 2.26 KB, created by yury fedorchenko on 2009-04-15 11:16:14 UTC

diff -urN glest-source-3.2.1/shared_lib/sources/xml/xml_parser.cpp glest-source-3.2.1.mod/shared_lib/sources/xml/xml_parser.cpp
--- glest-source-3.2.1/shared_lib/sources/xml/xml_parser.cpp	2009-02-13 18:52:25.000000000 +0300
+++ glest-source-3.2.1.mod/shared_lib/sources/xml/xml_parser.cpp	2009-04-15 11:13:46.000000000 +0400
@@ -87,10 +87,17 @@
 	
 	try{
 		ErrorHandler errorHandler;
-		DOMBuilder *parser= (static_cast<DOMImplementationLS*>(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
-		parser->setErrorHandler(&errorHandler);
-		parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
-		parser->setFeature(XMLUni::fgDOMValidation, true);
+#if XERCES_VERSION_MAJOR < 3		
+ 		DOMBuilder *parser= (static_cast<DOMImplementationLS*>(implementation))->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+ 		parser->setErrorHandler(&errorHandler);
+ 		parser->setFeature(XMLUni::fgXercesSchemaFullChecking, true);
+ 		parser->setFeature(XMLUni::fgDOMValidation, true);
+#else		
+		DOMLSParser *parser = (static_cast<DOMImplementationLS*>(implementation))->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+ 		DOMConfiguration  *config = parser->getDomConfig();
+		config->setParameter(XMLUni::fgXercesSchemaFullChecking, true);
+		config->setParameter(XMLUni::fgDOMValidate, true);
+#endif		
 		DOMDocument *document= parser->parseURI(path.c_str());
 		
 		if(document==NULL){
@@ -119,9 +126,20 @@
 		}
 		
 		LocalFileFormatTarget file(path.c_str());
-		DOMWriter* writer = implementation->createDOMWriter();
-		writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-		writer->writeNode(&file, *document);
+#if XERCES_VERSION_MAJOR < 3		
+ 		DOMWriter* writer = implementation->createDOMWriter();
+ 		writer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+ 		writer->writeNode(&file, *document);
+#else		
+		DOMLSSerializer *serializer = implementation->createLSSerializer();
+		DOMLSOutput* output=implementation->createLSOutput();
+		DOMConfiguration* config=serializer->getDomConfig();
+		config->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint,true);
+		output->setByteStream(&file);
+		serializer->write(document,output);
+		output->release();
+		serializer->release();
+#endif
 		document->release();
 	}
 	catch(const DOMException &e){