detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-25 07:40:03 +02:00
Code Issues Actions Packages Releases Activity

receiver create path (#35)

Browse Source
This commit is contained in:
Erik Fröjdh 2019-06-25 11:14:05 +02:00 committed by Dhanya Thattil
parent 136e00d15e
commit d3101baacb
4 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
slsReceiverSoftware/src/slsReceiverImplementation.cpp
View File

@ -13,6 +13,7 @@
#include "GeneralData.h" #include "GeneralData.h"
#include "Listener.h" #include "Listener.h"
#include "ZmqSocket.h" //just for the zmq port define #include "ZmqSocket.h" //just for the zmq port define
#include "file_utils.h"
#include <cerrno> //eperm #include <cerrno> //eperm
#include <cstdlib> //system #include <cstdlib> //system
@ -555,12 +556,8 @@ void slsReceiverImplementation::setFilePath(const char c[]) {
FILE_LOG(logDEBUG3) << __SHORT_AT__ << " called"; FILE_LOG(logDEBUG3) << __SHORT_AT__ << " called";
if (strlen(c)) { if (strlen(c)) {
// check if filepath exists mkdir_p(c); //throws if it can't create
struct stat st;
if (stat(c, &st) == 0)
strcpy(filePath, c); strcpy(filePath, c);
else
FILE_LOG(logERROR) << "FilePath does not exist: " << c;
} }
FILE_LOG(logINFO) << "File path: " << filePath; FILE_LOG(logINFO) << "File path: " << filePath;
} }

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -808,6 +808,8 @@ int slsReceiverTCPIPInterface::set_file_dir(Interface &socket) {
if (strlen(fPath) != 0) { if (strlen(fPath) != 0) {
FILE_LOG(logDEBUG1) << "Setting file path: " << fPath; FILE_LOG(logDEBUG1) << "Setting file path: " << fPath;
if(fPath[0] != '/')
throw RuntimeError("Receiver path needs to be absolute path");
impl()->setFilePath(fPath); impl()->setFilePath(fPath);
} }
std::string s = impl()->getFilePath(); std::string s = impl()->getFilePath();

4
slsSupportLib/include/file_utils.h
View File

@ -52,5 +52,5 @@ int writeDataFile(std::string fname,int nch, short int *data);
// mkdir -p path implemented by recursive calls
void mkdir_p(const std::string& path, std::string dir="");

25
slsSupportLib/src/file_utils.cpp
View File

@ -1,9 +1,12 @@
#include "file_utils.h" #include "file_utils.h"
#include "logger.h" #include "logger.h"
#include "sls_detector_exceptions.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
int readDataFile(std::ifstream &infile, short int *data, int nch, int offset) { int readDataFile(std::ifstream &infile, short int *data, int nch, int offset) {
int ichan, iline=0; int ichan, iline=0;
@ -77,5 +80,25 @@ int writeDataFile(std::string fname,int nch, short int *data) {
void mkdir_p(const std::string& path, std::string dir) {
if (path.length() == 0)
return;
size_t i = 0;
for (; i < path.length(); i++) {
dir += path[i];
if (path[i] == '/')
break;
}
if(mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0){
if (errno != EEXIST)
throw sls::RuntimeError("Could not create: " + dir);
}
if (i + 1 < path.length())
mkdir_p(path.substr(i + 1), dir);
}