Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2004/09/27 08:39:06 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2005/01/14 21:52:06 $
+ Version: $Revision: 1.33 $
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 <iostream>
-#include <algorithm>
+#include <iterator>
-#if defined(_MSC_VER) || defined (__CYGWIN__)
- #include <windows.h>
#ifdef _MSC_VER
+ #include <windows.h>
#include <direct.h>
-#endif //_MSC_VER
#else
#include <dirent.h>
- #include <unistd.h>
- #include <sys/stat.h>
#include <sys/types.h>
+ #include <sys/stat.h>
#endif
+namespace gdcm
+{
// Constructor / Destructor
/**
- * \ingroup gdcmDirList
+ * \ingroup DirList
* \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)
{
- name = dirName;
- NormalizePath(name);
- Explore(name, recursive);
+ DirName = dirName;
+ Explore(dirName, recursive);
}
/**
- * \ingroup gdcmDirList
+ * \ingroup DirList
* \brief Destructor
*/
-gdcmDirList::~gdcmDirList()
+DirList::~DirList()
{
}
//-----------------------------------------------------------------------------
// Public
/**
- * \ingroup gdcmDirList
+ * \ingroup DirList
* \brief Get the directory name
* @return the directory name
*/
-std::string gdcmDirList::GetDirName()
+std::string const &DirList::GetDirName() const
{
- return name;
+ return DirName;
+}
+
+void DirList::Print(std::ostream &os)
+{
+ copy(begin(), end(), std::ostream_iterator<std::string>(os, "\n"));
}
//-----------------------------------------------------------------------------
// Private
/**
- * \ingroup gdcmDirList
* \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
*/
-int gdcmDirList::Explore(std::string dirName, bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive)
{
int numberOfFiles = 0;
std::string fileName;
- NormalizePath(dirName);
-#if defined(_MSC_VER) || (__CYGWIN__)
+ std::string dirName = Util::NormalizePath(dirpath);
+#ifdef _MSC_VER
WIN32_FIND_DATA fileData;
HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
int found = true;
numberOfFiles++;
}
- found = FindNextFile(hFile,&fileData);
+ found = FindNextFile(hFile, &fileData);
}
#else
// bility of your programs.
struct stat buf;
- dirent* d = 0;
+ dirent *d = 0;
for (d = readdir(dir); d; d = readdir(dir))
{
fileName = dirName + d->d_name;
return numberOfFiles;
}
+} // end namespace gdcm
//-----------------------------------------------------------------------------