From 300b014f733e45246452197e13810e7d18813a0b Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 10 Mar 2017 10:51:28 +0100 Subject: [PATCH] somewhere --- slsReceiverSoftware/include/UDPBaseImplementation.h | 2 +- slsReceiverSoftware/include/sls_receiver_defs.h | 3 ++- slsReceiverSoftware/src/UDPBaseImplementation.cpp | 6 ++---- slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/slsReceiverSoftware/include/UDPBaseImplementation.h b/slsReceiverSoftware/include/UDPBaseImplementation.h index 1e0b83630..1ff91e387 100644 --- a/slsReceiverSoftware/include/UDPBaseImplementation.h +++ b/slsReceiverSoftware/include/UDPBaseImplementation.h @@ -285,7 +285,7 @@ class UDPBaseImplementation : protected virtual slsReceiverDefs, public UDPInter /** * Set File Path * Checks for file directory existence before setting file path, - * If it doesn't exist, it will set it blank + * If it exists, it sets it * @param c file path (max of 1000 characters) */ void setFilePath(const char c[]); diff --git a/slsReceiverSoftware/include/sls_receiver_defs.h b/slsReceiverSoftware/include/sls_receiver_defs.h index d44e9c6f3..fe91da31a 100755 --- a/slsReceiverSoftware/include/sls_receiver_defs.h +++ b/slsReceiverSoftware/include/sls_receiver_defs.h @@ -122,7 +122,8 @@ public: GET_FILE_FORMAT=-1,/**< the receiver will return its file format */ BINARY, /**< binary format */ ASCII, /**< ascii format */ - HDF5 /**< hdf5 format */ + HDF5, /**< hdf5 format */ + NUM_FILE_FORMATS }; diff --git a/slsReceiverSoftware/src/UDPBaseImplementation.cpp b/slsReceiverSoftware/src/UDPBaseImplementation.cpp index e01f21aaa..2e1f4cf3d 100644 --- a/slsReceiverSoftware/src/UDPBaseImplementation.cpp +++ b/slsReceiverSoftware/src/UDPBaseImplementation.cpp @@ -269,16 +269,14 @@ void UDPBaseImplementation::setFileName(const char c[]){ void UDPBaseImplementation::setFilePath(const char c[]){ FILE_LOG(logDEBUG) << __AT__ << " starting"; + if(strlen(c)){ //check if filepath exists struct stat st; if(stat(c,&st) == 0) strcpy(filePath,c); - else{ - strcpy(filePath,""); + else FILE_LOG(logWARNING) << "FilePath does not exist: " << filePath; - } - strcpy(filePath, c); } FILE_LOG(logDEBUG) << "Info: File path: " << filePath; } diff --git a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp index 14fd6dcab..c7e1d204a 100644 --- a/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp +++ b/slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp @@ -530,7 +530,7 @@ int slsReceiverTCPIPInterface::set_file_dir() { else{ receiverBase->setFilePath(fPath); retval = receiverBase->getFilePath(); - if(retval == NULL){ + if (retval == NULL || (strlen(fPath) && strcasecmp(fPath, retval))) { ret = FAIL; strcpy(mess,"receiver file path does not exist\n"); }