From d223e326ce00f701133170ee3f344456ceeb4c8c Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 3 Sep 2019 17:16:48 +0200 Subject: [PATCH] make Cloud module compile on Win32, still needs some porting --- src/Mod/Cloud/App/AppCloud.cpp | 34 +++++++++++++++++++++++++++------- src/Mod/Cloud/App/AppCloud.h | 25 +++++++++++-------------- 2 files changed, 38 insertions(+), 21 deletions(-) diff --git a/src/Mod/Cloud/App/AppCloud.cpp b/src/Mod/Cloud/App/AppCloud.cpp index 7c8ac97c3c..720dc06661 100644 --- a/src/Mod/Cloud/App/AppCloud.cpp +++ b/src/Mod/Cloud/App/AppCloud.cpp @@ -26,6 +26,10 @@ # include #endif +#include +#include +#include + #include #include #include @@ -41,6 +45,8 @@ #include "AppCloud.h" using namespace App; +using namespace std; +XERCES_CPP_NAMESPACE_USE /* Python entry */ PyMOD_INIT_FUNC(Cloud) @@ -54,7 +60,7 @@ Py::Object Cloud::Module::sCloudUrl(const Py::Tuple& args) { char *Url; if (!PyArg_ParseTuple(args.ptr(), "et","utf-8",&Url)) // convert args: Python->C - return Py::None(); + return Py::None(); if (this->Url.getStrValue() != Url) { this->Url.setValue(Url); } @@ -125,7 +131,11 @@ Cloud::CloudWriter::CloudWriter(const char* Url, const char* AccessKey, const ch // Amazon S3 and Swift require the timezone to be define to // GMT. As to simplify the conversion this is performed through the TZ // environment variable and a call to localtime as to convert output of gettimeofday +#if defined(FC_OS_WIN32) + _putenv("TZ=GMT"); +#else setenv("TZ","GMT",1); +#endif } Cloud::CloudWriter::~CloudWriter() @@ -139,7 +149,7 @@ size_t CurlWrite_CallbackFunc_StdString(void *contents, size_t size, size_t nmem { s->append((char*)contents, newLength); } - catch(std::bad_alloc &e) + catch(std::bad_alloc &) { //handle memory problem return 0; @@ -213,7 +223,6 @@ Cloud::CloudReader::~CloudReader() Cloud::CloudReader::CloudReader(const char* Url, const char* AccessKey, const char* SecretKey, const char* TcpPort, const char* Bucket) { - struct timeval tv; struct tm *tm; char date_formatted[256]; @@ -234,14 +243,21 @@ Cloud::CloudReader::CloudReader(const char* Url, const char* AccessKey, const ch // Amazon S3 and Swift require the timezone to be define to // GMT. As to simplify the conversion this is performed through the TZ // environment variable and a call to localtime as to convert output of gettimeofday +#if defined(FC_OS_WIN32) + _putenv("TZ=GMT"); +#else setenv("TZ","GMT",1); +#endif // We must get the directory content +#if defined(FC_OS_WIN32) +#else gettimeofday(&tv,NULL); tm = localtime(&tv.tv_sec); strftime(date_formatted,256,"%a, %d %b %Y %T %z", tm); +#endif sprintf(StringToSign,"GET\n\napplication/xml\n%s\n/%s/", date_formatted, this->Bucket); @@ -300,12 +316,11 @@ Cloud::CloudReader::CloudReader(const char* Url, const char* AccessKey, const ch "myxml (in memory)"); parser->parse(myxml_buf); - DOMDocument* dom=parser->getDocument(); + auto* dom=parser->getDocument(); checkXML(dom); // Dumping the filelist name } - } void Cloud::CloudReader::DownloadFile(Cloud::CloudReader::FileEntry *entry) @@ -323,9 +338,12 @@ void Cloud::CloudReader::DownloadFile(Cloud::CloudReader::FileEntry *entry) // We must get the directory content +#if defined(FC_OS_WIN32) +#else gettimeofday(&tv,NULL); tm = localtime(&tv.tv_sec); strftime(date_formatted,256,"%a, %d %b %Y %T %z", tm); +#endif // CHANGEME sprintf(StringToSign,"GET\n\napplication/octet-stream\n%s\n/%s/%s", date_formatted, this->Bucket, entry->FileName); @@ -369,7 +387,6 @@ void Cloud::CloudReader::DownloadFile(Cloud::CloudReader::FileEntry *entry) entry->FileStream << s; } - } struct Cloud::CloudReader::FileEntry * Cloud::CloudReader::GetEntry(std::string FileName) @@ -462,9 +479,12 @@ void Cloud::CloudWriter::pushCloud(const char *FileName, const char *data, long struct data_buffer curl_buffer; +#if defined(FC_OS_WIN32) +#else gettimeofday(&tv,NULL); tm = localtime(&tv.tv_sec); strftime(date_formatted,256,"%a, %d %b %Y %T %z", tm); +#endif // CHANGEME sprintf(StringToSign,"PUT\n\napplication/octet-stream\n%s\n/%s/%s", date_formatted, this->Bucket, FileName); @@ -623,7 +643,7 @@ void readFiles(Cloud::CloudReader reader, Base::XMLReader *xmlreader) it->Object->RestoreDocFile(localreader); if ( localreader.getLocalReader() != nullptr ) { - readFiles(reader, localreader.getLocalReader()); + readFiles(reader, localreader.getLocalReader().get()); } } it++; diff --git a/src/Mod/Cloud/App/AppCloud.h b/src/Mod/Cloud/App/AppCloud.h index 5901f0a2a4..5b78eb02f0 100644 --- a/src/Mod/Cloud/App/AppCloud.h +++ b/src/Mod/Cloud/App/AppCloud.h @@ -23,12 +23,8 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include #include #include @@ -44,13 +40,14 @@ #include #include -using namespace App; -using namespace std; -using namespace xercesc; +XERCES_CPP_NAMESPACE_BEGIN + class DOMNode; + class DOMText; +XERCES_CPP_NAMESPACE_END namespace Cloud { -class BaseExport CloudReader +class CloudAppExport CloudReader { public: CloudReader(const char* Url, const char* AccessKey, const char* SecretKey, const char* TcpPort, const char* Bucket); @@ -63,9 +60,9 @@ public: std::stringstream FileStream; int touch=0; }; - void checkText(DOMText* text); - void checkXML(DOMNode* node); - void checkElement(DOMElement* element); + void checkText(XERCES_CPP_NAMESPACE_QUALIFIER DOMText* text); + void checkXML(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode* node); + void checkElement(XERCES_CPP_NAMESPACE_QUALIFIER DOMElement* element); void addFile(struct Cloud::CloudReader::FileEntry *new_entry); struct FileEntry *GetEntry(std::string FileName); void DownloadFile(Cloud::CloudReader::FileEntry *entry); @@ -139,7 +136,7 @@ PyObject* initModule() // This class is writing files to an S3 cloud storage class -class BaseExport CloudWriter : public Base::Writer +class CloudAppExport CloudWriter : public Base::Writer { public: CloudWriter(const char* Url, const char* AccessKey, const char* SecretKey, const char* TcpPort, const char* Bucket);