X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=005700a72a42f06499352524bad89c62a5dd9dc4;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=dbe3c05166666dee7d8bde669344e1da35b4cb3f;hpb=7f62d92753e6a3e7f4f15093fb959dcb785d6c46;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index dbe3c051..005700a7 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/02/04 16:51:36 $ - Version: $Revision: 1.44 $ + Date: $Date: 2007/09/20 07:43:35 $ + Version: $Revision: 1.64 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,8 +18,14 @@ #include "gdcmDirList.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" + +#include "gdcmDicomDirImage.h" #include +#include +#include +#include //stat function #ifdef _MSC_VER #include @@ -27,10 +33,9 @@ #else #include #include - #include #endif -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -45,6 +50,14 @@ DirList::DirList(std::string const &dirName, bool recursive) Explore(dirName, recursive); } +/** + * \brief Constructor + * @param se DicomDirSerie we want to explore + */ +DirList::DirList(DicomDirSerie *se) +{ + Explore(se); +} /** * \brief Destructor */ @@ -61,20 +74,78 @@ DirList::~DirList() */ bool DirList::IsDirectory(std::string const &dirName) { -#ifndef _MSC_VER - struct stat buf; - stat(dirName.c_str(), &buf); - return S_ISDIR(buf.st_mode); + 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 (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0; + 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 //----------------------------------------------------------------------------- // 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 @@ -88,16 +159,17 @@ int DirList::Explore(std::string const &dirpath, bool recursive) 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; - b = FindNextFile(hFile,&fileData)) + b = FindNextFile(hFile, &fileData)) { fileName = fileData.cFileName; - if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) + if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { // Need to check for . and .. to avoid infinite loop - if( fileName != "." && fileName != ".." && recursive ) + if ( fileName != "." && fileName != ".." && recursive ) { numberOfFiles += Explore(dirName+fileName,recursive); } @@ -108,7 +180,23 @@ int DirList::Explore(std::string const &dirpath, bool recursive) numberOfFiles++; } } - if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile); + 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? + if( stat(fileName.c_str(), &buf) != 0 ) + { + gdcmErrorMacro( strerror(errno) ); + } + if ( S_ISREG(buf.st_mode) ) //is it a regular file? { Filenames.push_back( fileName ); numberOfFiles++; } - else if( S_ISDIR(buf.st_mode) ) //directory? + else if ( S_ISDIR(buf.st_mode) ) //directory? { - if( d->d_name[0] != '.' && recursive ) //we are also skipping hidden files + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files { numberOfFiles += Explore( fileName, recursive); } } else { - // we might need to do a different treament - //abort(); + gdcmErrorMacro( "Unexpected error" ); + return -1; } } - closedir(dir); + if( closedir(dir) != 0 ) + { + gdcmErrorMacro( strerror(errno) ); + } #endif return numberOfFiles; @@ -161,7 +255,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"));