On the way to gdcm2 ...

[gdcm.git] / src / gdcmDicomDir.cxx

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index a67ed04bbf9762a84894203b46983a7423ba5cc2..1226e49598d9b3ca02ef9a6a7d47d7f3d0d8f9ff 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/24 10:55:58 $
-  Version:   $Revision: 1.142 $
+  Date:      $Date: 2005/07/07 16:37:40 $
+  Version:   $Revision: 1.144 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -164,11 +164,52 @@ DicomDir::~DicomDir()
 //-----------------------------------------------------------------------------
 // Public
 
+/**
+ * \brief   Loader. use SetLoadMode(), SetFileName() before !  
+ * @return false if file cannot be open or no swap info was found,
+ *         or no tag was found.
+ */
+bool DicomDir::Load( ) 
+{
+   // We should clean out anything that already exists.
+   Initialize();  // sets all private fields to NULL
+
+   if (!ParseDir)
+   {
+      if ( ! this->Document::Load( ) )
+         return false;
+   }
+    return DoTheLoadingJob( );   
+}
+
+/**
+ * \brief   Loader. (DEPRECATED : not to break the API)
+ * @param   fileName file to be open for parsing
+ * @return false if file cannot be open or no swap info was found,
+ *         or no tag was found.
+ */
 bool DicomDir::Load(std::string const &fileName ) 
 {
-   Filename = fileName;
    // We should clean out anything that already exists.
+   Initialize();  // sets all private fields to NULL
 
+   SetFileName( fileName );
+   if (!ParseDir)
+   {
+      if ( ! this->Document::Load( ) )
+         return false;
+   }
+   return DoTheLoadingJob( );
+}
+
+/**
+ * \brief   Does the Loading Job (internal use only)
+ * @return false if file cannot be open or no swap info was found,
+ *         or no tag was found.
+ */
+bool DicomDir::DoTheLoadingJob( ) 
+{
+   // We should clean out anything that already exists.
    Initialize();  // sets all private fields to NULL
 
    if (!ParseDir)
@@ -180,10 +221,14 @@ bool DicomDir::Load(std::string const &fileName )
       {
          return false;
       }
-      Document::Load(fileName);
+      if (!Document::Load() )
+      {
+         return false;
+      }
+
       if ( GetFirstEntry() == 0 ) // when user passed a Directory to parse
       {
-         gdcmWarningMacro( "Entry HT empty for file: "<< fileName);
+         gdcmWarningMacro( "Entry HT empty for file: "<< GetFileName());
          return false;
       }
       // Directory record sequence
@@ -191,7 +236,7 @@ bool DicomDir::Load(std::string const &fileName )
       if ( !e )
       {
          gdcmWarningMacro( "NO 'Directory record sequence' (0x0004,0x1220)"
-                          << " in file " << fileName);
+                          << " in file " << GetFileName());
          return false;
       }
       else
@@ -201,7 +246,7 @@ bool DicomDir::Load(std::string const &fileName )
    {
    // Only if user passed a root directory
    // ------------------------------------
-      if ( fileName == "." )
+      if ( GetFileName() == "." )
       {
          // user passed '.' as Name
          // we get current directory name
@@ -210,8 +255,8 @@ bool DicomDir::Load(std::string const &fileName )
          SetFileName( dummy ); // will be converted into a string
       }
       NewMeta();
-      gdcmWarningMacro( "Parse directory and create the DicomDir : " << Filename );
-
+      gdcmWarningMacro( "Parse directory and create the DicomDir : " 
+                         << GetFileName() );
       ParseDirectory();
    }
    return true;
@@ -702,51 +747,61 @@ void DicomDir::CreateDicomDir()
          continue;
       }
 
-      if ( v == "PATIENT " )
+      // A decent DICOMDIR has much more images than series,
+      // more series than studies, and so on.
+      // This is the right order to preform the tests
+
+      if ( v == "IMAGE " ) 
       {
-         si = new DicomDirPatient(true);
-         if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
+         si = new DicomDirImage(true);
+         if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add PatientToEnd failed");
+            gdcmErrorMacro( "Add AddImageToEnd failed");
          }
       }
-      else if ( v == "STUDY " )
+      else if ( v == "SERIES" )
       {
-         si = new DicomDirStudy(true);
-         if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
+         si = new DicomDirSerie(true);
+         if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddStudyToEnd failed");
+            gdcmErrorMacro( "Add AddSerieToEnd failed");
          }
       }
-      else if ( v == "SERIES" )
+      else if ( v == "STUDY " )
       {
-         si = new DicomDirSerie(true);
-         if ( !AddSerieToEnd( static_cast<DicomDirSerie *>(si)) )
+         si = new DicomDirStudy(true);
+         if ( !AddStudyToEnd( static_cast<DicomDirStudy *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddSerieToEnd failed");
+            gdcmErrorMacro( "Add AddStudyToEnd failed");
          }
       }
-      else if ( v == "IMAGE " ) 
+      else if ( v == "PATIENT " )
       {
-         si = new DicomDirImage(true);
-         if ( !AddImageToEnd( static_cast<DicomDirImage *>(si)) )
+         si = new DicomDirPatient(true);
+         if ( !AddPatientToEnd( static_cast<DicomDirPatient *>(si)) )
          {
             delete si;
             si = NULL;
-            gdcmErrorMacro( "Add AddImageToEnd failed");
+            gdcmErrorMacro( "Add PatientToEnd failed");
          }
       }
       else
       {
-         // It was not a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
-         // neither an 'IMAGE' SQItem. Skip to next item.
-         continue;
+         // It was neither a 'PATIENT', nor a 'STUDY', nor a 'SERIE',
+         // nor an 'IMAGE' SQItem. Skip to next item.
+         gdcmWarningMacro( " -------------------------------------------"
+         << "a non PATIENT/STUDY/SERIE/IMAGE SQItem was found : "
+         << v);
+
+        // FIXME : deal with other item types !
+        tmpSI=s->GetNextSQItem(); // To avoid infinite loop
+        continue;
       }
       if ( si )
          MoveSQItem(si,tmpSI);
@@ -866,7 +921,7 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
          first = true;
       }
 
-      // if new Study Deal with 'STUDY' Elements   
+      // if new Study, deal with 'STUDY' Elements   
       if ( studCurInstanceUID != studPrevInstanceUID || studCurID != studPrevID 
          || first )
       {
@@ -874,7 +929,7 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
          first = true;
       }
 
-      // if new Serie Deal with 'SERIE' Elements   
+      // if new Serie, deal with 'SERIE' Elements   
       if ( serCurInstanceUID != serPrevInstanceUID || serCurID != serPrevID
          || first )
       {