#2975 BBTK Bug New Normal - Clean comments

[bbtk.git] / packages / std / src / bbstdFilesFromDirectory.cxx

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index 1aefdb16e4005719a68219f62bb9b1cf6b79fb1e..6712c8cca4230ee8a6008098204ff4d8d099d93c 100644 (file)
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -48,9 +48,10 @@ BBTK_BLACK_BOX_IMPLEMENTATION(FilesFromDirectory,bbtk::AtomicBlackBox);
 void FilesFromDirectory::Process()
 {
        Filenames.clear();
+       SimpleFilenames.clear();
        DirName         = bbGetInputIn();
        bool rec        = bbGetInputRecursive();
-       /*int nbFiles = */ Explore(DirName, rec);
+       /*int nbFiles = */ Explore(DirName, rec);
        CleanFilenames( bbGetInputIn() );
        bbSetOutputOut(Filenames);   
        bbSetOutputOutSimple(SimpleFilenames);   
@@ -113,7 +114,6 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
        //assert( dirName[dirName.size()-1] == '' );
        HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
-
        for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
        b = FindNextFile(hFile, &fileData))
        {
@@ -125,14 +125,16 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
          {
                        if (bbGetInputType()==1)
                        {
-                               Filenames.push_back(fileName);   
-                               numberOfFiles++;
+                       std::string temp = dirName+fileName;
+                       Filenames.push_back(temp);       
+                       numberOfFiles++;
                        } // Type ALL_directories
 
                        tmpNumberOfFiles        =       Explore(dirName+fileName, recursive);
                        if ((bbGetInputType()==2)&&tmpNumberOfFiles==0)
                        {
-                       Filenames.push_back(fileName);   
+                       std::string temp = dirName+fileName;
+                       Filenames.push_back(temp);       
                        numberOfFiles++;
                        } // Type Lsast_directories
                        
@@ -186,7 +188,7 @@ int FilesFromDirectory::Explore(std::string const &dirpath, bool recursive)
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
   // work on debian for example
 
-       DIR* dir = opendir(dirName.c_str());
+       DIR* dir = opendir( dirName.c_str() );
        if (!dir)
        {
                return 0;
@@ -267,11 +269,39 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 {
        std::string tmpString;
        int i,ii,sizeFilenames = Filenames.size();
+       int j,sizeFileEnd = bbGetInputFileEnd().size();
+
+       int okEraseElement;
+       
+//Selecting just the files in the FileEnd List
+       if (bbGetInputFileEnd().size()!=0)
+       {
+               for (i=sizeFilenames-1; i>=0; i--)
+               {
+                       okEraseElement=0;
+                       for (j=0; j<sizeFileEnd; j++)
+                       {
+                               std::string tmp=Filenames[i].substr( (Filenames[i].length()) - (bbGetInputFileEnd()[j]).length() ) ;
+                               if (bbGetInputFileEnd()[j].compare( tmp )==0 )
+                               {
+                                       okEraseElement++;
+                               } // if FileEnd
+                       } // for j                                      
+
+                       if (okEraseElement==0) 
+                       { 
+                               Filenames.erase( Filenames.begin()+i );
+                       }
+               } // for i      
+       } // if FileEnd !=0
+
+       sizeFilenames = Filenames.size();
 
 // Cleanning paths with spaces 
        for (i=0; i<sizeFilenames; i++)
        {
                tmpString=Filenames[i];
+
                std::string::size_type  spacePosition = tmpString.find_first_of(' ');
                if (spacePosition != std::string::npos)
                {
@@ -283,6 +313,7 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
                } // if spacePosition
        }
 
+
 // Alphabetical order  
        for (i=0; i<sizeFilenames; i++)
        {