Changeset 11893 for trunk/FACT++/src/datalogger.cc

Timestamp:

08/11/11 23:09:13 (13 years ago)

Author:

tbretz

Message:

Implemented a new determination fo run-number after noon in the fadctrl; created the possibility to add the date to the raw-data path; allow to set the path as program option; for all this moved some code from the datalogger to DimWriteStatistics

File:

• trunk/FACT++/src/datalogger.cc (modified) (2 diffs)

trunk/FACT++/src/datalogger.cc

@@ -414 +414 @@
 bool DataLogger::CreateDirectory(string path)
 {
-    //remove last '/', if present
-    if (path[path.size()-1] == '/')
-        path = path.substr(0, path.size()-1);
-
-    //create boost path
-    const boost::filesystem::path fullPath =  boost::filesystem::system_complete(boost::filesystem::path(path));
-
-    //if path does not exist, check if upper levels exist already
-    if (boost::filesystem::exists(fullPath))
-    {
-        //if path already exist, make sure it does not designate a file (filenames cannot be checked if they do not exist)
-        if (boost::filesystem::is_directory(fullPath))
-            return true;
-
-        Error("Path to be created contains a file name: '" + path + "'");
+    try
+    {
+        DimWriteStatistics::CreateDirectory(path);
+        return true;
+    }
+    catch (const runtime_error &e)
+    {
+        Error(e.what());
         return false;
     }
-
-    if (path.size() <= 1)
-    {//we're hitting "/", which SHOULD have existed...
-        Error("Something unexpected happened while creating a path");
-    }
-    CreateDirectory(path.substr(0, path.find_last_of('/')));
-
-    //path does not exist, and upper level have been created already by recusrion.
-    const mode_t rightsMask = S_IRWXU | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH; //everybody read, owner writes
-
-    const int returnValue = mkdir(path.c_str(), rightsMask);
-
-    if (returnValue != 0)
-    {
-        ostringstream str;
-        str << "mkdir() failed for '" << path << "': " << strerror(errno) << " [errno=" << errno << "]";
-        Error(str.str());
-        return false;
-    }
-
-    return true;
 }
 // --------------------------------------------------------------------------
@@ -461 +433 @@
 bool DataLogger::DoesPathExist(string path)
 {
-    const boost::filesystem::path fullPath = boost::filesystem::system_complete(boost::filesystem::path(path));
-
-    if (!boost::filesystem::exists(fullPath))
-       return false;
-
-    if (!boost::filesystem::is_directory(fullPath))
-    {
-        Error("Path given for checking '" + path + "' designate a file name. Please provide a path name only");
-        return false;
-    }
-
-    if (access(path.c_str(), R_OK|W_OK|X_OK) != 0)
-    {
-        Error("Missing read, write or execute permissions on directory '" + path + "'");
-        return false;
-    }
-
-    return true;
-}
+    return DimWriteStatistics::DoesPathExist(path, *this);
+}
+
 // --------------------------------------------------------------------------
 //