Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2005/07/12 14:58:26 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2007/06/08 12:49:37 $
+ Version: $Revision: 1.62 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDirList.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
+
+#include "gdcmDicomDirImage.h"
#include <iterator>
#include <assert.h>
+#include <errno.h>
#include <sys/stat.h> //stat function
#ifdef _MSC_VER
#include <sys/types.h>
#endif
-namespace gdcm
+namespace GDCM_NAME_SPACE
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
Explore(dirName, recursive);
}
+/**
+ * \brief Constructor
+ * @param dirName root directory name
+ * @param recursive whether we want to explore recursively or not
+ */
+DirList::DirList(DicomDirSerie *se)
+{
+ Explore(se);
+}
/**
* \brief Destructor
*/
*/
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
+ {
+ 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
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;
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 : "<<dirName);
+ return -1;
+ }
#else
// Real POSIX implementation: scandir is a BSD extension only, and doesn't
for (d = readdir(dir); d; d = readdir(dir))
{
fileName = dirName + d->d_name;
- stat(fileName.c_str(), &buf); //really discard output ?
+ 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 );
}
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;
* \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<std::string>(os, "\n"));