Fix mistypings

[gdcm.git] / src / gdcmDocEntryArchive.cxx

diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx
index 913c31008f6a3ebfc85e1155165ef78a2e80cf63..d3213c26164a01137aa76aa2100575b19ad59f6c 100644 (file)
--- a/src/gdcmDocEntryArchive.cxx
+++ b/src/gdcmDocEntryArchive.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/24 10:55:59 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2007/05/23 14:18:09 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,7 +22,7 @@
 
 #include <string>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -56,17 +56,25 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
    if ( !newEntry )
       return false;
 
-   uint16_t group = newEntry->GetDictEntry()->GetGroup();
-   uint16_t elem  = newEntry->GetDictEntry()->GetElement();
-   std::string key = DictEntry::TranslateToKey(group,elem);
+   //uint16_t group = newEntry->GetDictEntry()->GetGroup();
+   //uint16_t elem  = newEntry->GetDictEntry()->GetElement();
+   //TagKey key = DictEntry::TranslateToKey(group,elem);
 
-   if ( Archive.find(key)==Archive.end() )
+   TagKey key = newEntry->GetKey();
+   
+   if ( Archive.find(key) == Archive.end() )
    {
+      uint16_t group = newEntry->GetGroup();
+      uint16_t elem  = newEntry->GetElement();
+      
       // Save the old DocEntry if any
       DocEntry *old = ArchFile->GetDocEntry(group, elem);
       Archive[key]  = old;
       if ( old )
-         ArchFile->RemoveEntryNoDestroy(old);
+      {
+         old->Register();
+         ArchFile->RemoveEntry(old);
+      }
 
       // Set the new DocEntry
       ArchFile->AddEntry(newEntry);
@@ -86,15 +94,18 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
  */
 bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
 {
-   std::string key = DictEntry::TranslateToKey(group, elem);
-
+   //TagKey key = DictEntry::TranslateToKey(group, elem);
+   TagKey key(group, elem);
    if ( Archive.find(key)==Archive.end() )
    {
       // Save the old DocEntry if any
       DocEntry *old = ArchFile->GetDocEntry(group, elem);
       Archive[key] = old;
       if ( old )
-         ArchFile->RemoveEntryNoDestroy(old);
+      {
+         old->Register();
+         ArchFile->RemoveEntry(old);
+      }
 
       return true;
    }
@@ -111,19 +122,24 @@ bool DocEntryArchive::Push(uint16_t group, uint16_t elem)
  */
 bool DocEntryArchive::Restore(uint16_t group, uint16_t elem)
 {
-   std::string key=DictEntry::TranslateToKey(group, elem);
-
+   //TagKey key=DictEntry::TranslateToKey(group, elem);
+   TagKey key(group, elem);
    TagDocEntryHT::iterator restoreIt=Archive.find(key);
    if ( restoreIt!=Archive.end() )
    {
       // Delete the new value
       DocEntry *rem = ArchFile->GetDocEntry(group, elem);
       if ( rem )
+      {
          ArchFile->RemoveEntry(rem);
+      }
 
       // Restore the old value
-      if ( Archive[key] )
-         ArchFile->AddEntry(Archive[key]);
+      if ( restoreIt->second )
+      {
+         ArchFile->AddEntry(restoreIt->second);
+         restoreIt->second->Unregister();
+      }
 
       Archive.erase(restoreIt);
 
@@ -142,7 +158,8 @@ void DocEntryArchive::ClearArchive( )
        it!=Archive.end();
        ++it)
    {
-      delete it->second;
+      if(it->second)
+         it->second->Unregister();
    }
    Archive.clear();
 }