X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=e2b6211f7aa4ec0ce944ce0f6ec62a94ed4e5f98;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=71c09f24a242d0f742ded301c2180a0ede5351e2;hpb=a02866a66001f273faf0e96be8f7135e03105edf;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 71c09f24..e2b6211f 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2004/07/26 19:36:56 $ - Version: $Revision: 1.18 $ + 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 - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -18,59 +18,109 @@ #include "gdcmDirList.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" -#include -#include +#include "gdcmDicomDirImage.h" + +#include +#include +#include +#include //stat function -#if defined(_MSC_VER) || defined (__CYGWIN__) - #include #ifdef _MSC_VER + #include #include -#endif //_MSC_VER #else #include - #include - #include #include #endif +namespace GDCM_NAME_SPACE +{ +//----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDirList * \brief Constructor * @param dirName root directory name * @param recursive whether we want to explore recursively or not */ -gdcmDirList::gdcmDirList(std::string dirName, bool recursive) +DirList::DirList(std::string const &dirName, bool recursive, bool all) { - name = dirName; - NormalizePath(name); - Explore(name, recursive); + DirName = dirName; + Explore(dirName, recursive, all); } /** - * \ingroup gdcmDirList + * \brief Constructor + * @param se DicomDirSerie we want to explore + */ +DirList::DirList(DicomDirSerie *se) +{ + Explore(se); +} +/** * \brief Destructor */ -gdcmDirList::~gdcmDirList() +DirList::~DirList() { } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmDirList - * \brief Get the directory name - * @return the directory name + * \brief Tells us if file name corresponds to a Directory + * @param dirName file name to check + * @return true if the file IS a Directory */ -std::string gdcmDirList::GetDirName() +bool DirList::IsDirectory(std::string const &dirName) { - return name; + 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); +#else + return S_ISDIR(fs.st_mode); +#endif + } + 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 @@ -78,40 +128,94 @@ std::string gdcmDirList::GetDirName() // Private /** - * \ingroup gdcmDirList + * \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 dirName directory to explore + * @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 gdcmDirList::Explore(std::string dirName, bool recursive) +int DirList::Explore(std::string const &dirpath, bool recursive, bool all) { int numberOfFiles = 0; std::string fileName; - NormalizePath(dirName); -#if defined(_MSC_VER) || (__CYGWIN__) - WIN32_FIND_DATA fileData; - HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); - int found = true; + 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); - while( hFile != INVALID_HANDLE_VALUE && found ) + 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 { - // Is the '.' and '..' usefull ? - if( fileName != "." && fileName != ".." && recursive ) - { - numberOfFiles += Explore(dirName+fileName,recursive); - } + Filenames.push_back( fileName ); + numberOfFiles++; } else { - this->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; + } + } + } - found = FindNextFile(hFile,&fileData); + 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 ) { - this->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; } //----------------------------------------------------------------------------- +// Print +/** + * \brief Print method + * @param os ostream to write to + */ +void DirList::Print(std::ostream &os, std::string const &) +{ + std::copy(Filenames.begin(), Filenames.end(), + std::ostream_iterator(os, "\n")); +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm