WSL/SLF GitLab Repository

Skip to content
Snippets Groups Projects
Commit eb1fdd48 authored by Thomas Egger's avatar Thomas Egger
Browse files

Final adjustments for GSNIO on Windows: Compilation now is verified with VisualC++ and MinGW.

GSNIO.cc: changed the way we convert a double value to time_t.
parent 327f9ea0
No related branches found
No related tags found
No related merge requests found
......@@ -130,10 +130,15 @@ ENDIF(PLUGIN_SNIO)
IF(PLUGIN_GSNIO)
INCLUDE_DIRECTORIES(${INCLUDE_DIRECTORIES} "/usr/include")
#gsoap generates files that do lots of warnings, there is nothing we can do about it -> off
IF(NOT MSVC)
SET_SOURCE_FILES_PROPERTIES(gsn/soapC.cpp PROPERTIES COMPILE_FLAGS "-w")
SET_SOURCE_FILES_PROPERTIES(gsn/stdsoap2.cpp PROPERTIES COMPILE_FLAGS "-w")
ENDIF(NOT MSVC)
ADD_LIBRARY(${GSNIONAME} GSNIO.cc gsn/soapGSNWebServiceSoap12BindingProxy.cpp gsn/soapC.cpp gsn/stdsoap2.cpp)
TARGET_LINK_LIBRARIES(${GSNIONAME} ${SHAREDNAME})
IF(WIN32)
SET(EXTRA_LINK_LIBS "ws2_32")
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(${GSNIONAME} ${SHAREDNAME} ${EXTRA_LINK_LIBS})
SET_TARGET_PROPERTIES(${GSNIONAME} PROPERTIES
PREFIX "${LIBPREFIX}"
LIBRARY_OUTPUT_DIRECTORY ${PLUGIN_DIR}
......@@ -141,7 +146,9 @@ IF(PLUGIN_GSNIO)
VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
SOVERSION ${VERSION_MAJOR})
#necessary because gsoap uses long long
IF(NOT MSVC)
SET_TARGET_PROPERTIES(${GSNIONAME} PROPERTIES COMPILE_FLAGS "-Wno-long-long")
ENDIF(NOT MSVC)
SET(MYPLUGINS ${MYPLUGINS} ${GSNIONAME})
ENDIF(PLUGIN_GSNIO)
......
......@@ -397,7 +397,7 @@ void GSNIO::readData(const Date& dateStart, const Date& dateEnd, std::vector<Met
for (size_t ii=0; ii < data.queryResult.at(0)->streamElements.size(); ii++) {
double tt;
IOUtils::convertString(tt, *data.queryResult.at(0)->streamElements.at(ii)->timed);
tmpmeteo.date.setUnixDate(tt/1000.0);
tmpmeteo.date.setUnixDate((time_t)(floor(tt/1000.0)));
tmpmeteo.date.setTimeZone(default_timezone);
for (size_t jj=0; jj < data.queryResult.at(0)->streamElements.at(ii)->field.size(); jj++){
......@@ -434,7 +434,7 @@ void GSNIO::readData(const Date& dateStart, const Date& dateEnd, std::vector<Met
for (size_t ii=0; ii < responseNext.queryResult.at(0)->streamElements.size(); ii++) {
double tt;
IOUtils::convertString(tt, *responseNext.queryResult.at(0)->streamElements.at(ii)->timed);
tmpmeteo.date.setUnixDate(tt/1000.0);
tmpmeteo.date.setUnixDate((time_t)(floor(tt/1000.0)));
tmpmeteo.date.setTimeZone(default_timezone);
for (size_t jj=0; jj < responseNext.queryResult.at(0)->streamElements.at(ii)->field.size(); jj++) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment