X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=005700a72a42f06499352524bad89c62a5dd9dc4;hb=e7768bbebdc9a5972e396d71a3e848f5674ee378;hp=be14a0d4e69fece5d5120ec4f07975cfb18a5850;hpb=9ca0e4bb2208be93bebf21d0c5d75c8018e7605a;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index be14a0d4..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/06/24 10:55:59 $
-  Version:   $Revision: 1.51 $
+  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,9 +18,13 @@
 
 #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
@@ -31,7 +35,7 @@
    #include <sys/types.h>
 #endif
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -46,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
  */
@@ -62,27 +74,78 @@ DirList::~DirList()
  */
 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
+   {
+      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
@@ -96,6 +159,7 @@ 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;
@@ -116,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 : "<<dirName);
+      return -1;
+   }
 
 #else
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
@@ -129,7 +209,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    }
 
    // According to POSIX, the dirent structure contains a field char d_name[]
-   // of  unspecified  size, with at most NAME_MAX characters preceding the
+   // 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.
 
@@ -138,7 +218,10 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    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 );
@@ -146,18 +229,21 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
       }
       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;
@@ -169,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<std::string>(os, "\n"));