From 03552b0bb60c2cd68b3fb190312da4abe9384ee9 Mon Sep 17 00:00:00 2001
From: Markus Rosenstihl <markus.rosenstihl@physik.tu-darmstadt.de>
Date: Wed, 4 Feb 2015 09:11:24 +0000
Subject: [PATCH] * changes need for jessie, migration to libxerces version 3 *
 web links in frontend changed: berlios does not exist anymore

---
 core/job.cpp        |  9 ++++++---
 core/xml_result.cpp | 16 +++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/core/job.cpp b/core/job.cpp
index 63444be..038ced9 100644
--- a/core/job.cpp
+++ b/core/job.cpp
@@ -12,7 +12,7 @@
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
+//#include <xercesc/dom/DOMWriter.hpp>
 #include <xercesc/framework/MemBufFormatTarget.hpp>
 #include "core/job.h"
 #include "core/core.h"
@@ -114,9 +114,12 @@ experiment::experiment(size_t n, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* exp_
       XMLCh tempStr[100];
       XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode("LS", tempStr, 99);
       XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation *impl2=XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementationRegistry::getDOMImplementation(tempStr);
-      XERCES_CPP_NAMESPACE_QUALIFIER DOMWriter *theSerializer=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createDOMWriter();  
+      XERCES_CPP_NAMESPACE_QUALIFIER DOMLSSerializer *theSerializer=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createLSSerializer();  
+      XERCES_CPP_NAMESPACE_QUALIFIER DOMLSOutput *theOutputDesc=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createLSOutput();
       XERCES_CPP_NAMESPACE_QUALIFIER MemBufFormatTarget mem;
-      theSerializer->writeNode(&mem,*(description_tags->getDocumentElement()));
+      theOutputDesc->setByteStream(&mem);
+      XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *description_node = (description_tags->getDocumentElement());
+      theSerializer->write(description_node, theOutputDesc);
       theSerializer->release();
       description=std::string((char*)mem.getRawBuffer(),mem.getLen());
       mem.reset();
diff --git a/core/xml_result.cpp b/core/xml_result.cpp
index d7bd02b..052e191 100644
--- a/core/xml_result.cpp
+++ b/core/xml_result.cpp
@@ -6,7 +6,7 @@
 #include <xercesc/util/XMLString.hpp>
 #include <xercesc/util/PlatformUtils.hpp>
 #include <xercesc/util/XercesDefs.hpp>
-#include <xercesc/dom/DOMWriter.hpp>
+//#include <xercesc/dom/DOMWriter.hpp>
 #include <xercesc/framework/MemBufFormatTarget.hpp>
 
 /* ***************************************************************************************************
@@ -478,11 +478,17 @@ int xml_result_writer::write_configuration_results_to_file(const std::string& fi
   XMLCh tempStr[100];
   XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode("LS", tempStr, 99);
   XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementation *impl2=XERCES_CPP_NAMESPACE_QUALIFIER DOMImplementationRegistry::getDOMImplementation(tempStr);
-  XERCES_CPP_NAMESPACE_QUALIFIER DOMWriter *theSerializer=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createDOMWriter();  
+  XERCES_CPP_NAMESPACE_QUALIFIER DOMLSSerializer *theSerializer=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createLSSerializer();  
+  XERCES_CPP_NAMESPACE_QUALIFIER DOMLSOutput *theOutputDesc=((XERCES_CPP_NAMESPACE_QUALIFIER  DOMImplementationLS*)impl2)->createLSOutput();
+  
   for (configuration_results::const_iterator i=ress.begin(); i!=ress.end(); ++i)
     if ((*i)->tag->getDocumentElement()!=NULL) {
       XERCES_CPP_NAMESPACE_QUALIFIER MemBufFormatTarget mem;
-      theSerializer->writeNode(&mem,*((*i)->tag->getDocumentElement()));
+      theOutputDesc->setByteStream(&mem);
+      XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *the_node = (*i)->tag->getDocumentElement();
+      theSerializer->write(the_node ,theOutputDesc);
+      //theSerializer->writeNode(&mem,*((*i)->tag->getDocumentElement()));
+      
       fwrite((char*)mem.getRawBuffer(),sizeof(char),mem.getLen(),out);
       mem.reset();
     }
@@ -608,9 +614,9 @@ int xml_result_writer::write_adcdata_formated(FILE* out, const std::string& form
 int xml_result_writer::write_adcdata_base64(FILE* out, const adc_result* res) const {
   fprintf(out,"<adcdata samples=\"%" SIZETPRINTFLETTER "\" rate=\"%g\" channels=\"%i\">\n",res->samples,res->sampling_frequency, res->nchannels);
   unsigned int base64length=0;
-  XMLByte* base64buffer=XERCES_CPP_NAMESPACE_QUALIFIER Base64::encode((XMLByte*)res->data,res->samples*res->nchannels*sizeof(short int),&base64length);
+  XMLByte* base64buffer=XERCES_CPP_NAMESPACE_QUALIFIER Base64::encode((XMLByte*)res->data,res->samples*res->nchannels*sizeof(short int),(XMLSize_t*)&base64length);
   fwrite(base64buffer,1,base64length,out);
-  XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release(&base64buffer);
+  XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release((char**)&base64buffer);
   fprintf(out,"</adcdata>\n");
   return 0;
 }