markusro/damaris-backends
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Wiki Activity

* changes need for jessie, migration to libxerces version 3

Browse Source 
* web links in frontend changed: berlios does not exist anymore
This commit is contained in:
Markus Rosenstihl 2015-02-04 09:11:24 +00:00
parent a8aba4e718
commit 03552b0bb6
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/job.cpp
View File

@ -12,7 +12,7 @@
#include <xercesc/util/XMLString.hpp> #include <xercesc/util/XMLString.hpp>
#include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XercesDefs.hpp> #include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMWriter.hpp> //#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/MemBufFormatTarget.hpp> #include <xercesc/framework/MemBufFormatTarget.hpp>
#include "core/job.h" #include "core/job.h"
#include "core/core.h" #include "core/core.h"
@ -114,9 +114,12 @@ experiment::experiment(size_t n, XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* exp_
XMLCh tempStr[100]; XMLCh tempStr[100];
XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode("LS", tempStr, 99); 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 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; 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(); theSerializer->release();
description=std::string((char*)mem.getRawBuffer(),mem.getLen()); description=std::string((char*)mem.getRawBuffer(),mem.getLen());
mem.reset(); mem.reset();

16
core/xml_result.cpp
View File

@ -6,7 +6,7 @@
#include <xercesc/util/XMLString.hpp> #include <xercesc/util/XMLString.hpp>
#include <xercesc/util/PlatformUtils.hpp> #include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XercesDefs.hpp> #include <xercesc/util/XercesDefs.hpp>
#include <xercesc/dom/DOMWriter.hpp> //#include <xercesc/dom/DOMWriter.hpp>
#include <xercesc/framework/MemBufFormatTarget.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]; XMLCh tempStr[100];
XERCES_CPP_NAMESPACE_QUALIFIER XMLString::transcode("LS", tempStr, 99); 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 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) for (configuration_results::const_iterator i=ress.begin(); i!=ress.end(); ++i)
if ((*i)->tag->getDocumentElement()!=NULL) { if ((*i)->tag->getDocumentElement()!=NULL) {
XERCES_CPP_NAMESPACE_QUALIFIER MemBufFormatTarget mem; 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); fwrite((char*)mem.getRawBuffer(),sizeof(char),mem.getLen(),out);
mem.reset(); 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 { 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); fprintf(out,"<adcdata samples=\"%" SIZETPRINTFLETTER "\" rate=\"%g\" channels=\"%i\">\n",res->samples,res->sampling_frequency, res->nchannels);
unsigned int base64length=0; 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); fwrite(base64buffer,1,base64length,out);
XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release(&base64buffer); XERCES_CPP_NAMESPACE_QUALIFIER XMLString::release((char**)&base64buffer);
fprintf(out,"</adcdata>\n"); fprintf(out,"</adcdata>\n");
return 0; return 0;
} }