X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.cxx;h=9b7ac504d77f59f9be6998fdff5a316fa5d174d8;hb=c24bcd6f879ecc6ff437ac25d288a6f682c47206;hp=d7c747e660d7e3638f77a9a100168d92c12dcceb;hpb=9ec0d27e7a99329b32311fa693dca4a389b89833;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index d7c747e..9b7ac50 100644
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -1,5 +1,6 @@
 #include "bbstdFilesFromDirectory.h"
 #include "bbstdPackage.h"
+#include <string>
 
 #ifdef _MSC_VER
    #include <windows.h>
@@ -19,32 +20,29 @@ BBTK_BLACK_BOX_IMPLEMENTATION(FilesFromDirectory,bbtk::AtomicBlackBox);
 
 void FilesFromDirectory::Process()
 {
-
    DirName = bbGetInputIn();
    bool rec = bbGetInputRecursive();
    /*int nbFiles = */ Explore(DirName, rec);
-   bbSetOutputOut(Filenames);
+   bbSetOutputOut(Filenames);   
    
-  
+//  for (int i=0; i<Filenames.size(); i++)
+//     std::cout << "Filenames [" << i << "] = [" << Filenames[i] << "]" << std::endl;  
 }
-void FilesFromDirectory::bbUserConstructor()
-{
 
+void FilesFromDirectory::bbUserSetDefaultValues()
+{
     bbSetInputIn(".");
-    bbSetInputRecursive(false);
-  
+    bbSetInputRecursive(false);  
 }
-void FilesFromDirectory::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
 
-  
+void FilesFromDirectory::bbUserInitializeProcessing() 
+{ 
 }
-void FilesFromDirectory::bbUserDestructor()
-{
 
-  
+void FilesFromDirectory::bbUserFinalizeProcessing() 
+{
 }
-
+  
 /**
  * \brief   Add a SEPARATOR to the end of the name if necessary
  * @param   pathname file/directory name to normalize 
@@ -52,7 +50,7 @@ void FilesFromDirectory::bbUserDestructor()
 std::string FilesFromDirectory::NormalizePath(std::string const &pathname)
 {
 #ifdef _WIN32
-   const char FILESEPARATOR = '\\;
+   const char FILESEPARATOR = '\\';
 #else
    const char FILESEPARATOR = '/';
 #endif
@@ -92,12 +90,21 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
          // Need to check for . and .. to avoid infinite loop
          if ( fileName != "." && fileName != ".." && recursive )
          {
-            numberOfFiles += Explore(dirName+fileName,recursive);
+            numberOfFiles += Explore(dirName+fileName, recursive);
          }
       }
       else
       {
-         Filenames.push_back(dirName+fileName);
+         std::string temp = "\"" +dirName+fileName + "\"";
+         std::string::size_type spacePosition = temp.find_first_of(' ');
+		 if (spacePosition != std::string::npos) 
+	 {
+   std::cout << "=========================================== File name : [" <<temp << 
+              "] contains space(s); Discarted !" << std::endl;
+	    temp.insert(spacePosition, "\\");
+   continue;  /// \TODO : fix the trouble (vtk?)
+	 }      
+         Filenames.push_back(temp);
          numberOfFiles++;
       }
    }
@@ -139,14 +146,27 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
    for (d = readdir(dir); d; d = readdir(dir))
    {
       fileName = dirName + d->d_name;
+      std::string temp = fileName;
       if( stat(fileName.c_str(), &buf) != 0 )
       {
          //gdcmErrorMacro( strerror(errno) );
       }
       if ( S_ISREG(buf.st_mode) )    //is it a regular file?
       {
-         Filenames.push_back( fileName );
-         numberOfFiles++;
+         if ( d->d_name[0]!='.')
+         {
+	 
+             std::string::size_type /* long int */ spacePosition = temp.find_first_of(' ');
+             if (spacePosition != std::string::npos)
+	     {
+   std::cout << "=========================================== File name : [" <<temp << 
+              "] contains space(s); Discarted !" << std::endl;
+                 temp.insert(spacePosition, "\\");
+   continue;   /// \TODO : fix the trouble (vtk?)
+             }
+             Filenames.push_back(temp);	 
+             numberOfFiles++;
+         }
       }
       else if ( S_ISDIR(buf.st_mode) ) //directory?
       {