Changeset 17343

Timestamp:

11/23/13 12:58:48 (11 years ago)

Author:

tbretz

Message:

Removed DimWriteStatistics::CreateDirectory - can be replaced by boost::filesystem::create_directories (we loose the ability to set permissions explicitly, but linux users are used to get inherited permission for directory creation anyway

Location:

trunk/FACT++/src

Files:

• DataProcessorImp.cc (modified) (2 diffs)
• DimWriteStatistics.cc (modified) (1 diff)
• DimWriteStatistics.h (modified) (1 diff)
• datalogger.cc (modified) (3 diffs)

trunk/FACT++/src/DataProcessorImp.cc

@@ -1 +1 @@
 #include "DataProcessorImp.h"
+
+#include <boost/filesystem.hpp>
 
 #include "HeadersFAD.h"
 #include "EventBuilder.h"
 #include "tools.h"
-
-#include "DimWriteStatistics.h" // weird dependency
 
 using namespace std;
@@ -32 +32 @@
     try
     {
-        DimWriteStatistics::CreateDirectory(name.str());
+        boost::filesystem::create_directories(name);
     }
     catch (const runtime_error &)

trunk/FACT++/src/DimWriteStatistics.cc

@@ -132 +132 @@
 // --------------------------------------------------------------------------
 //
-//! Check if a given path exists
-//! @param path the path to be checked
-//! @return whether or not the creation has been successfull
-//
-void DimWriteStatistics::CreateDirectory(string path)
-{
-    namespace fs = boost::filesystem;
-
-    //remove last '/', if present
-    if (path[path.size()-1] == '/')
-        path = path.substr(0, path.size()-1);
-
-    //create boost path
-    const fs::path fullPath = fs::system_complete(fs::path(path));
-
-    //if path does not exist, check if upper levels exist already
-    if (fs::exists(fullPath))
-    {
-        //if path already exist, make sure it does not designate a file (filenames cannot be checked if they do not exist)
-        if (fs::is_directory(fullPath))
-            return;
-
-        throw runtime_error("Path to be created is a file  '" + path + "'");
-    }
-
-    // we're hitting "/", which SHOULD have existed...
-    if (path.size() <= 1)
-        throw runtime_error("Path to be created looks suspicious '"+path+"'");
-
-    if (path.find_last_of('/')!=string::npos)
-        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
-
-    if (mkdir(path.c_str(), rightsMask)==0)
-        return;
-
-    ostringstream str;
-    str << "mkdir() failed for '" << path << "': " << strerror(errno) << " [errno=" << errno << "]";
-    throw runtime_error(str.str());
-}
-
-// --------------------------------------------------------------------------
-//
 //! Sets the current folder
 //! @param folder the path to the folder

trunk/FACT++/src/DimWriteStatistics.h

@@ -82 +82 @@
 
     static bool DoesPathExist(std::string path, MessageImp &log);
-
-    static void CreateDirectory(std::string path);
 };
 

trunk/FACT++/src/datalogger.cc

@@ -368 +368 @@
     void TrimOldRunNumbers();
     ///Create a given directory
-    bool CreateDirectory(string path);
+    bool CreateDirectory(const string &path);
     /***************************************************
     * INHERITED FROM DimServiceInfoList
@@ -509 +509 @@
 //! @return whether or not the creation has been successfull
 //
-bool DataLogger::CreateDirectory(string path)
+bool DataLogger::CreateDirectory(const string &path)
 {
     try
     {
-        DimWriteStatistics::CreateDirectory(path);
+        boost::filesystem::create_directories(path);
         return true;
     }
@@ -532 +532 @@
     return DimWriteStatistics::DoesPathExist(path, *this);
 }
-
 
 void DataLogger::AddServer(const string& server)