X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntryArchive.cxx;h=c82a1e96c2c779a8010788813bf56c45468b87b5;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=27aa83d978e7f4aac02897942be8a7726914cc43;hpb=36600d4ddfcf47f565b6643a1f1d1856bf967ad7;p=gdcm.git

diff --git a/src/gdcmDocEntryArchive.cxx b/src/gdcmDocEntryArchive.cxx
index 27aa83d9..c82a1e96 100644
--- a/src/gdcmDocEntryArchive.cxx
+++ b/src/gdcmDocEntryArchive.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntryArchive.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/21 17:47:19 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/10/24 16:00:47 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -53,20 +53,23 @@ DocEntryArchive::~DocEntryArchive()
  */
 bool DocEntryArchive::Push(DocEntry *newEntry)
 {
-   if(!newEntry)
+   if ( !newEntry )
       return false;
 
    uint16_t group = newEntry->GetDictEntry()->GetGroup();
    uint16_t elem  = newEntry->GetDictEntry()->GetElement();
-   std::string key = DictEntry::TranslateToKey(group,elem);
+   TagKey key = DictEntry::TranslateToKey(group,elem);
 
-   if( Archive.find(key)==Archive.end() )
+   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);
+      if ( old )
+      {
+         old->Register();
+         ArchFile->RemoveEntry(old);
+      }
 
       // Set the new DocEntry
       ArchFile->AddEntry(newEntry);
@@ -78,7 +81,7 @@ bool DocEntryArchive::Push(DocEntry *newEntry)
 
 /**
  * \brief   Removes out of the Header a DocEntry.
- *          It's kept in archive.
+ *          (it's kept in archive).
  * @param   group   Group number of the Entry to remove
  * @param   elem  Element number of the Entry to remove
  * @return  FALSE when an other DocEntry is already archived with the same key
@@ -86,15 +89,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);
 
-   if( Archive.find(key)==Archive.end() )
+   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);
+      if ( old )
+      {
+         old->Register();
+         ArchFile->RemoveEntry(old);
+      }
 
       return true;
    }
@@ -111,19 +117,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);
 
    TagDocEntryHT::iterator restoreIt=Archive.find(key);
-   if( restoreIt!=Archive.end() )
+   if ( restoreIt!=Archive.end() )
    {
       // Delete the new value
       DocEntry *rem = ArchFile->GetDocEntry(group, elem);
-      if( rem )
+      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 +153,8 @@ void DocEntryArchive::ClearArchive( )
        it!=Archive.end();
        ++it)
    {
-      delete it->second;
+      if(it->second)
+         it->second->Unregister();
    }
    Archive.clear();
 }
@@ -166,7 +178,7 @@ void DocEntryArchive::Print(std::ostream &os)
        it!=Archive.end();
        ++it)
    {
-      if(it->second)
+      if ( it->second )
          it->second->Print(os);
    }
 }