X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdFilesFromDirectory.cxx;h=5f8feb37b04ff2457e740bfa8fab730726478bd3;hb=433d792763e9cebb963243fbd49fff719f69ed4a;hp=05283bcc7017b62055760b9e5a0b1e0fe9695fa5;hpb=b459e1177db6455b4a60afe8cbb7ad608231ed95;p=bbtk.git

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index 05283bc..5f8feb3 100644
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -47,6 +47,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(FilesFromDirectory,bbtk::AtomicBlackBox);
 
 void FilesFromDirectory::Process()
 {
+printf("EED FilesFromDirectory::Process Start\n");
+
 	Filenames.clear();
 	SimpleFilenames.clear();
    	DirName 	= bbGetInputIn();
@@ -55,6 +57,8 @@ void FilesFromDirectory::Process()
 	CleanFilenames( bbGetInputIn() );
    	bbSetOutputOut(Filenames);   
   	bbSetOutputOutSimple(SimpleFilenames);   
+
+printf("EED FilesFromDirectory::Process End\n");
 }
 
 void FilesFromDirectory::bbUserSetDefaultValues()
@@ -188,7 +192,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;
@@ -269,12 +273,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)
 		{
@@ -286,6 +317,7 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 		} // if spacePosition
 	}
 
+
 // Alphabetical order	
   	for (i=0; i<sizeFilenames; i++)
   	{
@@ -304,7 +336,6 @@ void FilesFromDirectory::CleanFilenames( std::string basePath )
 	unsigned int lenghtBasePath = basePath.length();
 	for (i=0; i<sizeFilenames; i++)
 	{
-
 		SimpleFilenames.push_back( Filenames[i].substr( lenghtBasePath ) );
 	} // for i