From: Eduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Date: Wed, 28 Dec 2016 13:52:49 +0000 (+0100)
Subject: #3049 BBTK Bug New Normal  -  package:std box:FilesFromDirectory NormalizePath
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=bbtk.git;a=commitdiff_plain;h=d71e30c7ee2a27d090576edbc5bb51e4de96fe92

#3049 BBTK Bug New Normal  -  package:std box:FilesFromDirectory NormalizePath
---

diff --git a/packages/std/src/bbstdFilesFromDirectory.cxx b/packages/std/src/bbstdFilesFromDirectory.cxx
index 6e097ee..e444b9b 100644
--- a/packages/std/src/bbstdFilesFromDirectory.cxx
+++ b/packages/std/src/bbstdFilesFromDirectory.cxx
@@ -52,7 +52,7 @@ void FilesFromDirectory::Process()
    	DirName 	= bbGetInputIn();
    	bool rec 	= bbGetInputRecursive();
 	/*int nbFiles = */ Explore(DirName, rec);
-	CleanFilenames( bbGetInputIn() );
+	CleanFilenames( DirName );
    	bbSetOutputOut(Filenames);   
   	bbSetOutputOutSimple(SimpleFilenames);   
 }
@@ -87,7 +87,7 @@ std::string FilesFromDirectory::NormalizePath(std::string const &pathname)
    std::string name = pathname;
    int size = name.size();
 
-   if ( name[size-1] != FILESEPARATOR )
+   if (!((name[size-1]=='/')||(name[size-1]=='\\')))
    {
       name += FILESEPARATOR;
    }