X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=e2b6211f7aa4ec0ce944ce0f6ec62a94ed4e5f98;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=be14a0d4e69fece5d5120ec4f07975cfb18a5850;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index be14a0d4..e2b6211f 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2005/06/24 10:55:59 $ - Version: $Revision: 1.51 $ + Date: $Date: 2009/05/26 10:27:38 $ + Version: $Revision: 1.68 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,20 +18,24 @@ #include "gdcmDirList.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" + +#include "gdcmDicomDirImage.h" #include #include +#include #include //stat function #ifdef _MSC_VER - #include + #include #include #else #include #include #endif -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -40,12 +44,20 @@ namespace gdcm * @param dirName root directory name * @param recursive whether we want to explore recursively or not */ -DirList::DirList(std::string const &dirName, bool recursive) +DirList::DirList(std::string const &dirName, bool recursive, bool all) { DirName = dirName; - Explore(dirName, recursive); + Explore(dirName, recursive, all); } +/** + * \brief Constructor + * @param se DicomDirSerie we want to explore + */ +DirList::DirList(DicomDirSerie *se) +{ + Explore(se); +} /** * \brief Destructor */ @@ -62,61 +74,149 @@ DirList::~DirList() */ bool DirList::IsDirectory(std::string const &dirName) { - struct stat fs; - assert( dirName[dirName.size()-1] != '/' ); - if ( stat(dirName.c_str(), &fs) == 0 ) - { + struct stat fs; + // std::cout << "dirName[dirName.size()-1] [" << dirName[dirName.size()-1] << "]" + // << std::endl; + //assert( dirName[dirName.size()-1] != GDCM_FILESEPARATOR ); + if ( stat(dirName.c_str(), &fs) == 0 ) + { #if _WIN32 - return ((fs.st_mode & _S_IFDIR) != 0); + return ((fs.st_mode & _S_IFDIR) != 0); #else - return S_ISDIR(fs.st_mode); + return S_ISDIR(fs.st_mode); #endif - } - else - { - return false; - } + } + else + { + gdcmStaticWarningMacro("[" << dirName << "] not found or is not a Directory"); + //gdcmStaticErrorMacro( strerror(errno) ); + return false; + } } +/** + * \brief Get the first entry while visiting Filenames + * \return The first if found, otherwhise "" + */ +std::string DirList::GetFirst() +{ + ItDirList = Filenames.begin(); + if (ItDirList != Filenames.end()) + return *ItDirList; + return ""; +} + +/** + * \brief Get the next entry while visiting Filenames + * \return The next if found, otherwhise "" + */ +std::string DirList::GetNext() +{ + gdcmAssertMacro (ItDirList != Filenames.end()) + { + ++ItDirList; + if (ItDirList != Filenames.end()) + return *ItDirList; + } + return ""; +} + //----------------------------------------------------------------------------- // Protected //----------------------------------------------------------------------------- // Private + +/** + * \brief Explores a DicomDirSerie + * return number of files found + * @param se DicomDirSerie to explore + */ +int DirList::Explore(DicomDirSerie *se) +{ + int numberOfFiles = 0; + + DicomDirImage *im = se->GetFirstImage(); + while ( im ) + { + Filenames.push_back( im->GetEntryString(0x0004, 0x1500) );// File name (Referenced File ID) + numberOfFiles++; + im = se->GetNextImage(); + } + return numberOfFiles; +} + /** * \brief Explore a directory with possibility of recursion * return number of files read * @param dirpath directory to explore * @param recursive whether we want recursion or not + * @param all whether we want all (i.e; File names + Directory names) default=false */ -int DirList::Explore(std::string const &dirpath, bool recursive) +int DirList::Explore(std::string const &dirpath, bool recursive, bool all) { int numberOfFiles = 0; std::string fileName; std::string dirName = Util::NormalizePath(dirpath); #ifdef _MSC_VER WIN32_FIND_DATA fileData; + //assert( dirName[dirName.size()-1] == '' ); HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); - for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; + for(BOOL b = (hFile != INVALID_HANDLE_VALUE); + b; b = FindNextFile(hFile, &fileData)) { - fileName = fileData.cFileName; - if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) + fileName = dirName + fileData.cFileName; + // avoid infinite loop! + if ( GDCM_NAME_SPACE::Util::GetName(fileName) == "." || GDCM_NAME_SPACE::Util::GetName(fileName) == "..") + continue; + + if (all) // meaningfull only when recursive=false { - // Need to check for . and .. to avoid infinite loop - if ( fileName != "." && fileName != ".." && recursive ) - { - numberOfFiles += Explore(dirName+fileName,recursive); - } + Filenames.push_back( fileName ); + numberOfFiles++; } else { - Filenames.push_back(dirName+fileName); - numberOfFiles++; - } + if ( !( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) ) //is it a regular file? + { + Filenames.push_back( fileName ); + numberOfFiles++; + + } + else if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) //directory? + { + if ( GDCM_NAME_SPACE::Util::GetName(fileName)[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive); + } + } + else + { + gdcmErrorMacro( "Unexpected error" ); + return -1; + } + } + } + + DWORD dwError = GetLastError(); + if (hFile != INVALID_HANDLE_VALUE) + FindClose(hFile); + if (dwError != ERROR_NO_MORE_FILES) + { + LPVOID lpMsgBuf; + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER| + FORMAT_MESSAGE_FROM_SYSTEM| + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL,GetLastError(), + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR) &lpMsgBuf,0,NULL); + + gdcmErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf + <<" for the directory : "<d_name; - stat(fileName.c_str(), &buf); //really discard output ? - if ( S_ISREG(buf.st_mode) ) //is it a regular file? + //std::cout << d->d_name << std::endl; + // avoid infinite loop! + if ( GDCM_NAME_SPACE::Util::GetName(d->d_name) == "." || GDCM_NAME_SPACE::Util::GetName(d->d_name) == "..") + continue; + + if( stat(fileName.c_str(), &buf) != 0 ) { - Filenames.push_back( fileName ); - numberOfFiles++; + gdcmErrorMacro( strerror(errno) ); } - else if ( S_ISDIR(buf.st_mode) ) //directory? + + if (all) // meaningfull only when recursive=false { - if ( d->d_name[0] != '.' && recursive ) //we are also skipping hidden files - { - numberOfFiles += Explore( fileName, recursive); - } + Filenames.push_back( fileName ); + numberOfFiles++; } else { - // we might need to do a different treament - //abort(); - } + if ( S_ISREG(buf.st_mode) ) //is it a regular file? + { + Filenames.push_back( fileName ); + numberOfFiles++; + } + else if ( S_ISDIR(buf.st_mode) ) //directory? + { + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive); + } + } + else + { + gdcmErrorMacro( "Unexpected error" ); + return -1; + } + } + } + + if( closedir(dir) != 0 ) + { + gdcmErrorMacro( strerror(errno) ); } - closedir(dir); #endif return numberOfFiles; @@ -169,7 +290,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) * \brief Print method * @param os ostream to write to */ -void DirList::Print(std::ostream &os) +void DirList::Print(std::ostream &os, std::string const &) { std::copy(Filenames.begin(), Filenames.end(), std::ostream_iterator(os, "\n"));