DICOMDIR skeleton modifs, for future version

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index d10cacae8823af65fa20e75d8c294877b9a07e61..36bdca4f6fa6926b9acd2a6a57bb2d6442c50ee9 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:28 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2004/07/20 08:29:13 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -99,18 +99,31 @@ void gdcmValEntry::Print(std::ostream & os)
       s << " [gdcm::too long for print (" << GetLength() << ") ]";
    }
    
-   // Display the UID value (instead of displaying only the rough code)  
+   // Display the UID value (instead of displaying only the rough code)
+   // First 'clean' trailing character (space or zero) 
    if (g == 0x0002) {  // Any more to be displayed ?
-      if ( (e == 0x0010) || (e == 0x0002) )
+      if ( (e == 0x0010) || (e == 0x0002) ) {
+         if ( v.length() != 0 )  // for brain damaged headers
+            if ( ! isdigit(v[v.length()-1]) )
+               v.erase(v.length()-1, 1);
          s << "  ==>\t[" << ts->GetValue(v) << "]";
+      }
    } else {
       if (g == 0x0008) {
-         if ( (e == 0x0016) || (e == 0x1150)  )
+         if ( (e == 0x0016) || (e == 0x1150)  ) {
+            if ( v.length() != 0 )  // for brain damaged headers
+               if ( ! isdigit(v[v.length()-1]) )
+                  v.erase(v.length()-1, 1);
             s << "  ==>\t[" << ts->GetValue(v) << "]";
+         }
       } else {
          if (g == 0x0004) {
-           if ( (e == 0x1510) || (e == 0x1512)  )
+           if ( (e == 0x1510) || (e == 0x1512)  ) {
+              if ( v.length() != 0 )  // for brain damaged headers  
+                 if ( ! isdigit(v[v.length()-1]) )
+                    v.erase(v.length()-1, 1);  
               s << "  ==>\t[" << ts->GetValue(v) << "]";
+            }
          }     
       }
    }