X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=090d3ce3ef30535c5206baadf96aa63745ef3077;hb=f2dd0107ba49eda3386b34715cdc0c046d12397f;hp=efdc939369ee3cf2ad6a3c1f54ca4728631fa8a0;hpb=746c9ec7ec0fbe389b0894c80a8393ecd5472479;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index efdc9393..090d3ce3 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/06/28 09:30:58 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2007/09/17 12:21:56 $
+  Version:   $Revision: 1.63 $
                                                                                 
   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,57 +18,108 @@
 
 #include "gdcmDirList.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
-#include <iostream>
-#include <algorithm>
+#include "gdcmDicomDirImage.h"
+
+#include <iterator>
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>  //stat function
 
-#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/types.h>
 #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)
 {
-   name=dirName;
-   NormalizePath(name);
-   Explore(name,recursive);
+   DirName = dirName;
+   Explore(dirName, recursive);
 }
 
 /**
- * \ingroup gdcmDirList
+ * \brief Constructor  
+ * @param  se DicomDirSerie we want to explore
+ */
+DirList::DirList(DicomDirSerie *se)
+{
+   Explore(se);
+}
+/**
  * \brief  Destructor
  */
-gdcmDirList::~gdcmDirList(void)
+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(void)
+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
+   {
+      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
 
@@ -76,54 +127,138 @@ std::string gdcmDirList::GetDirName(void)
 // 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
- * @param  dirName directory to explore
+ *          return number of files read
+ * @param  dirpath   directory to explore
  * @param  recursive whether we want recursion or not
  */
-void 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__)
-   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 = fileData.cFileName;
+      if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
       {
-         if( (fileName!=".") && (fileName!="..") && (recursive) )
-            Explore(dirName+fileName,recursive);
+         // Need to check for . and .. to avoid infinite loop
+         if ( fileName != "." && fileName != ".." && recursive )
+         {
+            numberOfFiles += Explore(dirName+fileName,recursive);
+         }
       }
       else
       {
-         this->push_back(dirName+fileName);
+         Filenames.push_back(dirName+fileName);
+         numberOfFiles++;
       }
+   }
+   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);
 
-      found=FindNextFile(hFile,&fileData);
+      gdcmErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf
+                   <<" for the directory : "<<dirName);
+      return -1;
    }
 
 #else
-   struct dirent **namelist;
-   int n=scandir(dirName.c_str(), &namelist, 0, alphasort);
+  // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
+  // work on debian for example
+
+   DIR* dir = opendir(dirName.c_str());
+   if (!dir)
+   {
+      return 0;
+   }
+
+   // According to POSIX, the dirent structure contains a field char d_name[]
+   // of unspecified size, with at most NAME_MAX characters preceeding the
+   // terminating null character. Use of other fields will harm the  porta-
+   // bility of your programs.
 
-   for (int i= 0;i < n; i++) 
+   struct stat buf;
+   dirent *d;
+   for (d = readdir(dir); d; d = readdir(dir))
    {
-      fileName=namelist[i]->d_name;     
-      if(namelist[i]->d_type==DT_DIR)
+      fileName = dirName + d->d_name;
+      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?
       {
-         if( (fileName!=".") && (fileName!="..") && (recursive) )
-            Explore(dirName+fileName,recursive);
+         if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files
+         {
+            numberOfFiles += Explore( fileName, recursive);
+         }
       }
       else
       {
-         this->push_back(dirName+fileName);
+         gdcmErrorMacro( "Unexpected error" );
+         return -1;
       }
    }
+   if( closedir(dir) != 0 )
+   {
+      gdcmErrorMacro( strerror(errno) );
+   }
 #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<std::string>(os, "\n"));
 }
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm