X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDicomDir.cxx;h=3a57a57a4d4d42805550e0ea50c08ca562805e35;hb=259d893061b237f67812d3902008df85e562277f;hp=b8501864e7d4907f7125c4d1cbfe911fe34aafcf;hpb=f24973b3daa0b2214838857d02bd61db6d4a0a40;p=gdcm.git

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index b8501864..3a57a57a 100644
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/17 22:36:55 $
-  Version:   $Revision: 1.56 $
+  Date:      $Date: 2004/09/27 08:39:05 $
+  Version:   $Revision: 1.70 $
   
   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
@@ -19,7 +19,6 @@
 #include <string>
 #include <algorithm>
 #include <sys/types.h>
-#include <errno.h>
 
 #ifdef _MSC_VER 
    #include <direct.h>
@@ -46,29 +45,22 @@
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
-void gdcmDicomDir::Initialize()
-{
-   startMethod             = NULL;
-   progressMethod          = NULL;
-   endMethod               = NULL;
-   startMethodArgDelete    = NULL;
-   progressMethodArgDelete = NULL;
-   endMethodArgDelete      = NULL;
-   startArg                = NULL;
-   progressArg             = NULL;
-   endArg                  = NULL;
-
-   progress = 0.0;
-   abort = false;
-
-   metaElems = (gdcmDicomDirMeta *)0;   
+/**
+ * \ingroup gdcmDicomDir
+ * \brief   Constructor : creates an empty gdcmDicomDir
+ */
+gdcmDicomDir::gdcmDicomDir()
+   :gdcmDocument( )
+{ 
+   Initialize();  // sets all private fields to NULL
+   std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ...   
+   metaElems = NewMeta();
 }
 
-
 /**
  * \brief Constructor Parses recursively the directory and creates the DicomDir
  *        or uses an already built DICOMDIR, depending on 'parseDir' value.
- * @param FileName        name 
+ * @param fileName        name 
  *                      - of the root directory (parseDir = true)
  *                      - of the DICOMDIR       (parseDir = false)
  * @param parseDir boolean
@@ -76,36 +68,35 @@ void gdcmDicomDir::Initialize()
  *                        and wants to explore recursively the directories
  *                      - false if user passed an already built DICOMDIR file
  *                        and wants to use it 
- * @param exception_on_error whether we want to throw an exception or not
  */
-gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir,
-                           bool exception_on_error):
-   gdcmDocument( fileName, exception_on_error, true) // true : enable SeQuences
+gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir ):
+   gdcmDocument( fileName )
 {
-   // que l'on ai passe un root directory ou un DICOMDIR
-   // et quelle que soit la valeur de parseDir,
-   // on a deja lance gdcmDocument 
-   Initialize();
+   // Whatever user passed (a root directory or a DICOMDIR)
+   // and whatever the value of parseDir was,
+   // gdcmDocument is already executed
+   Initialize();  // sets all private fields to NULL
 
-   // gdcmDocument already executed
    // if user passed a root directory, sure we didn't get anything
 
-   if( GetEntry().begin() == GetEntry().end() ) 
+   if ( TagHT.begin() == TagHT.end() ) // when user passed a Directory to parse
    {
       dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : entry HT empty");
 
-      if( fileName.size() == 1 && fileName[0] == '.' )
+      if ( fileName.size() == 1 && fileName[0] == '.' )
       {
          // user passed '.' as Name
          // we get current directory name
          char* dummy = new char[1000];
          getcwd(dummy, (size_t)1000);
          SetFileName( dummy ); // will be converted into a string
-         delete[] dummy;     // no longer needed   
+         delete[] dummy;       // no longer needed   
       }
 
-      if( parseDir )
+      if ( parseDir ) // user asked for a recursive parsing of a root directory
       {
+         metaElems = NewMeta();
+
          dbg.Verbose(0, "gdcmDicomDir::gdcmDicomDir : Parse directory"
                         " and create the DicomDir");
          ParseDirectory();
@@ -113,9 +104,11 @@ gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir,
       else
       {
          /// \todo if parseDir == false, it should be tagged as an error
+         // NON ! il suffit d'appeler ParseDirectory() 
+         // apres le constructeur
       }
    }
-   else
+   else // Only if user passed a DICOMDIR
    {
       // Directory record sequence
       gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
@@ -130,21 +123,6 @@ gdcmDicomDir::gdcmDicomDir(std::string const & fileName, bool parseDir,
    }
 }
 
-/**
- * \ingroup gdcmDicomDir
- * \brief   Constructor : creates an empty gdcmDicomDir
- * @param   exception_on_error whether we want to throw an exception or not
- */
-gdcmDicomDir::gdcmDicomDir(bool exception_on_error):                           
-   gdcmDocument( exception_on_error )
-{ 
-   Initialize();
-
-   std::string pathBidon = "Bidon"; // Sorry, NULL not allowed ...
-   SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements
-   AddDicomDirMeta();
-}
-
 /**
  * \brief  Canonical destructor 
  */
@@ -153,18 +131,16 @@ gdcmDicomDir::~gdcmDicomDir()
    SetStartMethod(NULL);
    SetProgressMethod(NULL);
    SetEndMethod(NULL);
-
-   if( metaElems )
-   {
-      delete metaElems;
-   }
-   
    for(ListDicomDirPatient::iterator cc = patients.begin();
                                      cc!= patients.end();
                                    ++cc)
    {
       delete *cc;
    }
+   if ( metaElems )
+   {
+      delete metaElems;
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -176,14 +152,14 @@ void gdcmDicomDir::Print(std::ostream &os)
 {
    if(metaElems)
    {
-      metaElems->SetPrintLevel(printLevel);
+      metaElems->SetPrintLevel(PrintLevel);
       metaElems->Print(os);   
    }   
    for(ListDicomDirPatient::iterator cc  = patients.begin();
                                      cc != patients.end();
                                    ++cc)
    {
-     (*cc)->SetPrintLevel( printLevel );
+     (*cc)->SetPrintLevel( PrintLevel );
      (*cc)->Print( os );
    }
 }
@@ -216,6 +192,29 @@ bool gdcmDicomDir::IsReadable()
    return true;
 }
 
+/**
+ * \brief Sets all fields to NULL
+ */
+
+void gdcmDicomDir::Initialize()
+{
+   startMethod             = NULL;
+   progressMethod          = NULL;
+   endMethod               = NULL;
+   startMethodArgDelete    = NULL;
+   progressMethodArgDelete = NULL;
+   endMethodArgDelete      = NULL;
+   startArg                = NULL;
+   progressArg             = NULL;
+   endArg                  = NULL;
+
+   progress = 0.0;
+   abort = false;
+
+   metaElems = 0;   
+}
+
+
 /**
  * \ingroup gdcmDicomDir
  * \brief  fills the whole structure, starting from a root Directory
@@ -234,8 +233,8 @@ void gdcmDicomDir::ParseDirectory()
  * @param   argDelete    Argument 
  * \warning In python : the arg parameter isn't considered
  */
-void gdcmDicomDir::SetStartMethod(gdcmMethod *method, void *arg, 
-                                  gdcmMethod *argDelete )
+void gdcmDicomDir::SetStartMethod(gdcmMethod* method, void* arg, 
+                                  gdcmMethod* argDelete )
 {
    if( startArg && startMethodArgDelete )
    {
@@ -254,7 +253,7 @@ void gdcmDicomDir::SetStartMethod(gdcmMethod *method, void *arg,
  *          class is destroyed
  * @param   method Method to call to delete the argument
  */
-void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method) 
+void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod* method) 
 {
    startMethodArgDelete = method;
 }
@@ -267,8 +266,8 @@ void gdcmDicomDir::SetStartMethodArgDelete(gdcmMethod *method)
  * @param   argDelete    Argument  
  * \warning In python : the arg parameter isn't considered
  */
-void gdcmDicomDir::SetProgressMethod(gdcmMethod *method, void *arg, 
-                                     gdcmMethod *argDelete )
+void gdcmDicomDir::SetProgressMethod(gdcmMethod* method, void* arg, 
+                                     gdcmMethod* argDelete )
 {
    if( progressArg && progressMethodArgDelete )
    {
@@ -287,7 +286,7 @@ void gdcmDicomDir::SetProgressMethod(gdcmMethod *method, void *arg,
  *          class is destroyed          
  * @param   method Method to call to delete the argument
  */
-void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method)
+void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod* method)
 {
    progressMethodArgDelete = method;
 }
@@ -300,8 +299,8 @@ void gdcmDicomDir::SetProgressMethodArgDelete(gdcmMethod *method)
  * @param   argDelete    Argument 
  * \warning In python : the arg parameter isn't considered
  */
-void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg, 
-                                gdcmMethod *argDelete )
+void gdcmDicomDir::SetEndMethod(gdcmMethod* method, void* arg, 
+                                gdcmMethod* argDelete )
 {
    if( endArg && endMethodArgDelete )
    {
@@ -320,7 +319,7 @@ void gdcmDicomDir::SetEndMethod(gdcmMethod *method, void *arg,
  *          is destroyed
  * @param   method Method to call to delete the argument
  */
-void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method)
+void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod* method)
 {
    endMethodArgDelete = method;
 }
@@ -337,84 +336,42 @@ void gdcmDicomDir::SetEndMethodArgDelete(gdcmMethod *method)
  * @return false only when fail to open
  */
  
-bool gdcmDicomDir::Write(std::string const & fileName) 
-{
-   FILE * fp1;
+bool gdcmDicomDir::WriteDicomDir(std::string const& fileName) 
+{  
+   uint16_t sq[4] = { 0x0004, 0x1220, 0xffff, 0xffff };
+   uint16_t sqt[4]= { 0xfffe, 0xe0dd, 0xffff, 0xffff };
 
-   fp1 = fopen(fileName.c_str(), "wb");
-   if( !fp1 ) 
+   FILE* fp = fopen(fileName.c_str(), "wb");
+   if( !fp ) 
    {
       printf("Failed to open(write) File [%s] \n", fileName.c_str());
       return false;
    }
 
-   char * filePreamble = new char[128];
-   fwrite(filePreamble,128,1,fp1);
-   fwrite("DICM",4,1,fp1);
+   uint8_t* filePreamble = new  uint8_t[128];
+   memset(filePreamble, 0, 128);
+   fwrite(filePreamble,128,1,fp);
+   fwrite("DICM",4,1,fp);
    delete[] filePreamble;
-   UpdateDirectoryRecordSequenceLength();
-   WriteEntries(fp1);
+ 
+   gdcmDicomDirMeta *ptrMeta = GetDicomDirMeta();
+   ptrMeta->Write(fp, gdcmExplicitVR);
+   
+   // force writing 0004|1220 [SQ ], that CANNOT exist within gdcmDicomDirMeta
+   fwrite(&sq[0],8,1,fp);  // 0004 1220 ffff ffff
+        
+   for(ListDicomDirPatient::iterator cc = patients.begin();cc!=patients.end();++cc)
+   {
+      (*cc)->Write( fp, gdcmExplicitVR );
+   }
+   
+   // force writing Sequence Delimitation Item
+   fwrite(&sqt[0],8,1,fp);  // fffe e0dd ffff ffff 
 
-   fclose( fp1 );
+   fclose( fp );
    return true;
 }
 
-/**
- * \brief   Writes in a file using the tree-like structure.
- * @param   _fp already open file pointer
- */
-
-void gdcmDicomDir::WriteEntries(FILE *) //_fp
-{   
-   /// \todo (?) tester les echecs en ecriture 
-   ///          (apres chaque fwrite, dans le WriteEntry)
-
-
-/* TODO : to go on compiling
-
-   gdcmDicomDirMeta *ptrMeta;
-   ListDicomDirPatient::iterator  itPatient;
-   ListDicomDirStudy::iterator    itStudy;
-   ListDicomDirSerie::iterator    itSerie;
-   ListDicomDirImage::iterator    itImage; 
-   ListTag::iterator i; 
-   
-   ptrMeta= GetDicomDirMeta();
-   for(i=ptrMeta->debut();i!=ptrMeta->fin();++i) {
-      WriteEntry(*i,_fp, gdcmExplicitVR);
-   }   
-    
-   itPatient = GetDicomDirPatients().begin(); 
-   while ( itPatient != GetDicomDirPatients().end() ) {
-      for(i=(*itPatient)->debut();i!=(*itPatient)->fin();++i) {
-         WriteEntry(*i,_fp, gdcmExplicitVR);
-      }
-      itStudy = ((*itPatient)->GetDicomDirStudies()).begin();     
-      while (itStudy != (*itPatient)->GetDicomDirStudies().end() ) {
-         for(i=(*itStudy)->debut();i!=(*itStudy)->fin();++i) {
-            WriteEntry(*i,_fp, gdcmExplicitVR);
-         } 
-         itSerie = ((*itStudy)->GetDicomDirSeries()).begin();
-         while (itSerie != (*itStudy)->GetDicomDirSeries().end() ) {
-            for(i=(*itSerie)->debut();i!=(*itSerie)->fin();++i) {
-               WriteEntry(*i,_fp, gdcmExplicitVR);
-            }
-            itImage = ((*itSerie)->GetDicomDirImages()).begin();
-            while (itImage != (*itSerie)->GetDicomDirImages().end() ) {
-               for(i=(*itImage)->debut();i!=(*itImage)->fin();++i) {
-                  WriteEntry(*i,_fp, gdcmExplicitVR);
-               }
-               ++itImage;
-            }
-            ++itSerie;
-         }
-         ++itStudy;
-      } 
-      ++itPatient;     
-   }
-   */
-}   
-   
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -431,7 +388,7 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path)
    VectDocument list;
    gdcmHeader *header;
 
-   tagHT.clear();
+   TagHT.clear();
    patients.clear();
 
    for( gdcmDirList::iterator it  = fileList.begin();
@@ -445,29 +402,36 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path)
          break;
       }
 
-      header = new gdcmHeader(it->c_str(),false,true);
-      if(!header) {
-         std::cout << "echec new Header " << it->c_str() << std::endl; // JPR
-      }
-      if(header->IsReadable()) {
-         list.push_back(header);  // adds the file header to the chained list
-         std::cout << "readable : " <<it->c_str() << std::endl; // JPR
-       }
-      else
+      header = new gdcmHeader( it->c_str() );
+      if( !header )
       {
-         delete header;
+         dbg.Verbose( 1,
+                      "gdcmDicomDir::CreateDicomDirChainedList: "
+                      "failure in new Header ",
+                      it->c_str() );
       }
-      count++;
+      
+      if( header->IsReadable() )
+      {
+         // Add the file header to the chained list:
+         list.push_back(header);
+         dbg.Verbose( 1,
+                      "gdcmDicomDir::CreateDicomDirChainedList: readable ",
+                      it->c_str() );
 
+       }
+       else
+       {
+          delete header;
+       }
+       count++;
    }
    // sorts Patient/Study/Serie/
    std::sort(list.begin(), list.end(), gdcmDicomDir::HeaderLessThan );
-
-   std::string tmp = fileList.GetDirName();
-      
+   
+   std::string tmp = fileList.GetDirName();      
    //for each Header of the chained list, add/update the Patient/Study/Serie/Image info
    SetElements(tmp, list);
-      
    CallEndMethod();
 }
 
@@ -475,22 +439,34 @@ void gdcmDicomDir::CreateDicomDirChainedList(std::string const & path)
  * \ingroup gdcmDicomDir
  * \brief   adds *the* Meta to a partially created DICOMDIR
  */
- 
- /// \todo FIXME : Heuuuuu ! Il prend les Entries du Document deja parse,
- ///                  il ne fabrique rien !
   
 gdcmDicomDirMeta * gdcmDicomDir::NewMeta()
 {
-   gdcmDicomDirMeta *m = new gdcmDicomDirMeta( &tagHT );
-   for ( TagDocEntryHT::iterator cc  = tagHT.begin(); 
-                                 cc != tagHT.end(); ++cc)
-   {
-      m->AddDocEntry( cc->second );
+   gdcmDicomDirMeta *m = new gdcmDicomDirMeta( &TagHT );
+  
+   if ( TagHT.begin() != TagHT.end() ) // after Document Parsing
+   { 
+      TagDocEntryHT::iterator lastOneButSequence = TagHT.end();
+      lastOneButSequence --;
+      // ALL the 'out of Sequence' Tags belong to Meta Elems
+      // (we skip 0004|1220 [Directory record sequence] )
+      for ( TagDocEntryHT::iterator cc  = TagHT.begin(); 
+                                    cc != lastOneButSequence;
+                                   ++cc)
+      {
+         m->AddDocEntry( cc->second );
+      }
    }
+   else  // after root directory parsing
+   {
+     std::list<gdcmElement> elemList;
+     elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements();
+     m->FillObject(elemList);
+    }
+   m->SetSQItemNumber(0); // To avoid further missprinting
    return m;  
 }
 
-
 /**
  * \brief   adds a new Patient (with the basic elements) to a partially created DICOMDIR
  */
@@ -500,16 +476,12 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient()
    uint16_t tmpGr,tmpEl;
    gdcmDictEntry *dictEntry;
    gdcmValEntry *entry;
-   
+
+   std::list<gdcmElement> elemList;   
+   elemList=gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements(); 
    gdcmSQItem *s = new gdcmSQItem(0);
-   
-   std::list<gdcmElement> elemList = 
-         gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();  
-   
-   /// \todo TODO : use FillObject !!!
 
-   // for all the DicomDirPatient Elements 
-     
+   // for all the DicomDirPatient Elements      
    for( it = elemList.begin(); it != elemList.end(); ++it ) 
    {
       tmpGr     = it->group;
@@ -544,7 +516,7 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient()
       s->AddDocEntry( entry );
    }
 
-   gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &tagHT);
+   gdcmDicomDirPatient *p = new gdcmDicomDirPatient(s, &TagHT);
    patients.push_front( p );
 
    return p;   
@@ -554,7 +526,7 @@ gdcmDicomDirPatient * gdcmDicomDir::NewPatient()
  * \brief   adds to the HTable 
  *          the gdcmEntries (Dicom Elements) corresponding to the given type
  * @param   path full path file name (only used when type = GDCM_DICOMDIR_IMAGE
- * @param   type gdcmObject type to create (GDCM_DICOMDIR_PATIENT,
+ * @param   type gdcmDicomDirObject type to create (GDCM_DICOMDIR_PATIENT,
  *          GDCM_DICOMDIR_STUDY, GDCM_DICOMDIR_SERIE ...)
  * @param   header gdcmHeader of the current file
  */
@@ -567,45 +539,58 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,
    gdcmDictEntry *dictEntry;
    gdcmValEntry *entry;
    std::string val;
-
+   gdcmSQItem *si = new gdcmSQItem(0); // all the items will be at level 1
    switch( type )
    {
-      case GDCM_DICOMDIR_PATIENT:
-         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();
-         break;
-      case GDCM_DICOMDIR_STUDY:
-         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+      case GDCM_DICOMDIR_IMAGE:
+         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements();
          break;
+
       case GDCM_DICOMDIR_SERIE:
          elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirSerieElements();
          break;
-      case GDCM_DICOMDIR_IMAGE:
-         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirImageElements();
+
+      case GDCM_DICOMDIR_STUDY:
+         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirStudyElements();
+         break;
+
+      case GDCM_DICOMDIR_PATIENT:
+         elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirPatientElements();
          break;
+  
       case GDCM_DICOMDIR_META:
          elemList = gdcmGlobal::GetDicomDirElements()->GetDicomDirMetaElements();
          break;
+
       default:
          return;
    }
+   // removed all the seems-to-be-useless stuff about Referenced Image Sequence
+   // to avoid further troubles
+   // imageElem 0008 1140 "" // Referenced Image Sequence
+   // imageElem fffe e000 "" // 'no length' item : length to be set to 0xffffffff later
+   // imageElem 0008 1150 "" // Referenced SOP Class UID    : to be set/forged later
+   // imageElem 0008 1155 "" // Referenced SOP Instance UID : to be set/forged later
+   // imageElem fffe e00d "" // Item delimitation : length to be set to ZERO later
+   // for all the relevant elements found in their own spot of the DicomDir.dic
+   // FIXME : troubles found when it's a SeqEntry
 
    for( it = elemList.begin(); it != elemList.end(); ++it)
    {
       tmpGr     = it->group;
       tmpEl     = it->elem;
       dictEntry = GetPubDict()->GetDictEntryByNumber(tmpGr, tmpEl);
+
       entry     = new gdcmValEntry( dictEntry ); // Be sure it's never a BinEntry !
 
       entry->SetOffset(0); // just to avoid further missprinting
+      entry->SetLength(0); // just to avoid further missprinting
 
-      if( header )
-      {
+      if( header ) // NULL when we Build Up (ex nihilo) a DICOMDIR
+                   //   or when we add the META elems
          val = header->GetEntryByNumber(tmpGr, tmpEl);
-      }
       else
-      {
          val = GDCM_UNFOUND;
-      }
 
       if( val == GDCM_UNFOUND) 
       {
@@ -623,30 +608,26 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,
                val = header->GetFileName();
             }
             else
-            {
                val = &(header->GetFileName().c_str()[path.length()]);
-            }   
          }
          else
-         {
             val = it->value;
-         }
       }
       else
       {
          if ( header->GetEntryLengthByNumber(tmpGr,tmpEl) == 0 )
-         {
             val = it->value;
-         }
       }
 
-      entry->SetValue( val );
+     // GDCM_UNFOUND or not !
+
+      entry->SetValue( val ); // troubles expected when vr=SQ ...
 
       if( dictEntry )
       {
          if( dictEntry->GetGroup() == 0xfffe )
          {
-            entry->SetLength( entry->GetValue().length() );
+            entry->SetLength( entry->GetValue().length() ); // FIXME 
          }
          else if( dictEntry->GetVR() == "UL" || dictEntry->GetVR() == "SL" )
          {
@@ -665,9 +646,38 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,
             entry->SetLength( entry->GetValue().length() );
          }
       }
-      //AddDocEntry(entry); // both in H Table and in chained list
-      tagHT[entry->GetKey()] = entry;          // FIXME : use a SEQUENCE !
+
+      if ( type == GDCM_DICOMDIR_META ) // fusible : should never print !
+      {
+         std::cout << "GDCM_DICOMDIR_META ?!? should never print that" 
+                   << std::endl;
+      }
+      si->AddEntry(entry);
    }
+   switch( type )
+   {
+      case GDCM_DICOMDIR_IMAGE:
+         AddDicomDirImageToEnd(si);
+         break;
+
+      case GDCM_DICOMDIR_SERIE:
+         AddDicomDirSerieToEnd(si);
+         break;
+
+      case GDCM_DICOMDIR_STUDY:
+         AddDicomDirStudyToEnd(si);
+         break;
+
+      case GDCM_DICOMDIR_PATIENT:
+         AddDicomDirPatientToEnd(si);
+         break;
+
+      default:
+         return;
+   }
+   //int count=1;            // find a trick to increment
+   //s->AddEntry(si, count); // Seg Faults 
+
 }
 
 /**
@@ -724,8 +734,6 @@ void gdcmDicomDir::CreateDicomDir()
    //       + we create the object for the precedent tag
    //       + loop to 1 -
 
-   gdcmDicomDirType type = gdcmDicomDir::GDCM_DICOMDIR_META;
-   
    // Directory record sequence
    gdcmDocEntry *e = GetDocEntryByNumber(0x0004, 0x1220);
    if ( !e )
@@ -740,12 +748,14 @@ void gdcmDicomDir::CreateDicomDir()
    if ( !s )
    {
       dbg.Verbose(0, "gdcmDicomDir::CreateDicomDir: no SeqEntry present");
+      // useless : (0x0004,0x1220) IS a Sequence !
       return;
    }
 
+   gdcmDicomDirType type = gdcmDicomDir::GDCM_DICOMDIR_META;
+   metaElems = NewMeta();
+
    ListSQItem listItems = s->GetSQItems();
-   gdcmDicomDirMeta *m  = new gdcmDicomDirMeta(&tagHT);
-   (void)m; //??
    
    gdcmDocEntry * d;
    std::string v;
@@ -766,25 +776,21 @@ void gdcmDicomDir::CreateDicomDir()
       if( v == "PATIENT " )
       {
          AddDicomDirPatientToEnd( *i );
-         //AddObjectToEnd(type,*i);
          type = gdcmDicomDir::GDCM_DICOMDIR_PATIENT;
       }
       else if( v == "STUDY " )
       {
          AddDicomDirStudyToEnd( *i );
-        // AddObjectToEnd(type,*i);
          type = gdcmDicomDir::GDCM_DICOMDIR_STUDY;
       }
       else if( v == "SERIES" )
       {
          AddDicomDirSerieToEnd( *i );
-         //  AddObjectToEnd(type,*i);
          type = gdcmDicomDir::GDCM_DICOMDIR_SERIE;
       }
       else if( v == "IMAGE " ) 
       {
          AddDicomDirImageToEnd( *i );
-         //   AddObjectToEnd(type,*i);
          type = gdcmDicomDir::GDCM_DICOMDIR_IMAGE;
       }
       else
@@ -796,46 +802,6 @@ void gdcmDicomDir::CreateDicomDir()
    }
 }
 
-/**
- * \ingroup gdcmDicomDir
- * \brief   AddObjectToEnd
- * @param   type
- * @param   begin iterator on the first DocEntry within the chained List
- * @param   end iterator on the last DocEntry within the chained List
- */
- 
-// now  useless ?
-
-/*void gdcmDicomDir::AddObjectToEnd(gdcmDicomDirType type,gdcmSQItem *s)
-{
-   if(s==NULL) // ??
-      return;
-
-   switch(type)
-   {
-      case gdcmDicomDir::GDCM_DICOMDIR_META:
-         AddDicomDirMeta();
-         break;      
-      case gdcmDicomDir::GDCM_DICOMDIR_PATIENT:
-         AddDicomDirPatientToEnd(s);
-         break;
-      case gdcmDicomDir::GDCM_DICOMDIR_STUDY:
-         AddDicomDirStudyToEnd(s);
-         break;
-      case gdcmDicomDir::GDCM_DICOMDIR_SERIE:
-         AddDicomDirSerieToEnd(s);
-         break;
-      case gdcmDicomDir::GDCM_DICOMDIR_IMAGE:
-         AddDicomDirImageToEnd(s);
-         break;
-      case gdcmDicomDir::GDCM_DICOMDIR_NONE:
-         AddDicomDirImageToEnd(s);        //FIXME
-         break;
-   }
-}
-
-*/
-
 /**
  * \ingroup gdcmDicomDir
  * \brief Well ... there is only one occurence  
@@ -846,7 +812,7 @@ void gdcmDicomDir::AddDicomDirMeta()
    {
       delete metaElems;
    }
-   metaElems = new gdcmDicomDirMeta( &tagHT );
+   metaElems = new gdcmDicomDirMeta( &TagHT );
 }
 
 /**
@@ -856,7 +822,7 @@ void gdcmDicomDir::AddDicomDirMeta()
  */
 void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s)
 {
-   patients.push_back(new gdcmDicomDirPatient(s, &tagHT));
+   patients.push_back(new gdcmDicomDirPatient(s, &TagHT));
 }
 
 /**
@@ -870,7 +836,7 @@ void gdcmDicomDir::AddDicomDirPatientToEnd(gdcmSQItem *s)
    {
       ListDicomDirPatient::iterator itp = patients.end();
       itp--;
-      (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &tagHT));
+      (*itp)->AddDicomDirStudy(new gdcmDicomDirStudy(s, &TagHT));
    }
 }
 
@@ -890,7 +856,7 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s)
       {
          ListDicomDirStudy::iterator itst=(*itp)->GetDicomDirStudies().end();
          itst--;
-         (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &tagHT));
+         (*itst)->AddDicomDirSerie(new gdcmDicomDirSerie(s, &TagHT));
       }
    }
 }
@@ -916,7 +882,7 @@ void gdcmDicomDir::AddDicomDirSerieToEnd(gdcmSQItem *s)
          {
             ListDicomDirSerie::iterator its = (*itst)->GetDicomDirSeries().end();
             its--;
-            (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &tagHT));
+            (*its)->AddDicomDirImage(new gdcmDicomDirImage(s, &TagHT));
          }
       }
    }
@@ -938,8 +904,6 @@ void gdcmDicomDir::SetElements(std::string &path, VectDocument &list)
    std::string studCurInstanceUID, studCurID;
    std::string serCurInstanceUID,  serCurID;
 
-   SetElement( path, GDCM_DICOMDIR_META,NULL);
-
    for( VectDocument::iterator it = list.begin();
                               it != list.end(); ++it )
    {
@@ -989,36 +953,4 @@ bool gdcmDicomDir::HeaderLessThan(gdcmDocument *header1, gdcmDocument *header2)
    return *header1 < *header2;
 }
 
-/**
- * \brief   Sets the accurate value for the (0x0004,0x1220) element of a DICOMDIR
- */
-void gdcmDicomDir::UpdateDirectoryRecordSequenceLength()
-{
-
-/// \todo FIXME : to go on compiling
-///
-/// to be re written !
-///   int offset = 0;
-///   ListTag::iterator it;
-///   uint16_t gr, el;
-///   std::string vr;
-///   for(it=listEntries.begin();it!=listEntries.end();++it) {
-///      gr = (*it)->GetGroup();
-///      el = (*it)->GetElement();
-///      vr = (*it)->GetVR();      
-///      if (gr !=0xfffe) {
-///         if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) {    
-///            offset +=  4; // explicit VR AND OB, OW, SQ : 4 more bytes
-///         }         
-///         offset += 2 + 2 + 4 + (*it)->GetLength(); 
-///      } else {
-///         offset +=  4; // delimiters don't have a value.     
-///      }            
-///   }   
-///   //bool res=SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps.
-///    SetEntryLengthByNumber(offset, 0x0004, 0x1220); // Hope there is no dupps.
-///   return;
-///
-}
-
 //-----------------------------------------------------------------------------