SerieHelper::CreateUserDefinedFileIdentifier doesn't convert unfound fields

[gdcm.git] / src / gdcmValidator.cxx

diff --git a/src/gdcmValidator.cxx b/src/gdcmValidator.cxx
index 045a95d193098ee128b2130a7aca1a21352fe05c..c6cc6958e850f9e3951ac4c39200e7f8b2126560 100644 (file)
--- a/src/gdcmValidator.cxx
+++ b/src/gdcmValidator.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValidator.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/05 13:25:26 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/11/21 09:43:43 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -29,11 +29,11 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 typedef std::map<uint16_t, int> GroupHT;    //  Hash Table
 //-----------------------------------------------------------------------------
-
+/// \brief Constructor
 Validator::Validator()
 {
 }
-
+///\brief Canonical Destructor
 Validator::~Validator()
 {
 }
@@ -68,9 +68,12 @@ bool CheckVM(DataEntry *entry)
 
 void Validator::SetInput(ElementSet *input)
 {
+
+DocEntry *d;
+/*
 // First stage to check group length
   GroupHT grHT;
-  DocEntry *d=input->GetFirstEntry();
+  d=input->GetFirstEntry();
   while(d)
   {
     grHT[d->GetGroup()] = 0;
@@ -80,7 +83,7 @@ void Validator::SetInput(ElementSet *input)
   {
       std::cout << std::hex << it->first << std::endl; 
   } 
-
+*/
 
   // berk for now SetInput do two things at the same time
   d=input->GetFirstEntry();
@@ -96,11 +99,15 @@ void Validator::SetInput(ElementSet *input)
       if ( v->GetVM() != gdcm::GDCM_UNKNOWN )
          if ( !CheckVM(v) )
          {
-           std::cout << "Tag (" <<  v->GetKey() 
-                     << ")-> [" << v->GetName() << "] contains an illegal VM. "
-                     << "value [" << v->GetString() << "] VR :"
-                     << v->GetVR() << ", Expected VM :" << v->GetVM() << " " 
-                     << std::endl;
+            if (v->GetVM() == "FIXME" )
+              std::cout << "For Tag " <<  v->GetKey() << " VM = ["
+                       << v->GetVM() << "]" << std::endl;
+ 
+            std::cout << "Tag (" <<  v->GetKey() 
+                      << ")-> [" << v->GetName() << "] VR :" << v->GetVR() 
+                      << " contains an illegal VM. Expected VM :[" 
+                      << v->GetVM() << "], value [" << v->GetString() << "]" 
+                      << std::endl;
          }
       
       if ( v->GetReadLength() % 2 )