avoid further troubles when wild anonymization was performed

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index fc0f2135b7838d77fcb177c1638a773b077998e0..4e215e7fb221ca8a96a9c2f8e02b3cb4b9224791 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/14 07:48:52 $
-  Version:   $Revision: 1.69 $
+  Date:      $Date: 2010/04/09 15:38:18 $
+  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
@@ -13,7 +13,7 @@
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notices for more information.
-                                                                                
+                                                                              
 =========================================================================*/
 
 #include "gdcmSerieHelper.h"
@@ -1092,23 +1092,30 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File *inFile )
          }
       }
       // Eliminate non-alphanum characters, including whitespace.
+
       unsigned int s_size = s.size();
-      for(unsigned int i=0; i<s_size; i++)
+      if(s_size == 0)
+      { // to avoid further troubles when wild anonymization was performed
+         s = "a";
+      }
+      else
       {
-         while(i<s_size
+         for(unsigned int i=0; i<s_size; i++)
+         {
+            while(i<s_size
                && !( s[i] == '.' || s[i] == '%' || s[i] == '_'
                  || (s[i] >= '+' && s[i] <= '-')       
                  || (s[i] >= 'a' && s[i] <= 'z')
                  || (s[i] >= '0' && s[i] <= '9')
                  || (s[i] >= 'A' && s[i] <= 'Z')))
-         {
-            s.replace(i, 1, "_");  // ImagePositionPatient related stuff will be more human readable
+            {
+               s.replace(i, 1, "_");  // ImagePositionPatient related stuff will be more human readable
+            }
          }
+         // deal with Dicom strings trailing '\0' 
+         if(s[s_size-1] == '_')
+            s.erase(s_size-1, 1);
       }
-      // deal with Dicom strings trailing '\0' 
-      if(s[s_size-1] == '_')
-         s.erase(s_size-1, 1);
-      
       id += s.c_str();
       id += "%%%"; // make the FileIdentifier Tokenizable
    }

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 95a62acaad9e8d42b7674ac24058ac207726fdb3..c7405f4ec2f6f0a664e4a425efca501893cb1fea 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2009/05/19 15:08:37 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2010/04/09 15:38:18 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,13 +60,14 @@ class File;
  *    into several XCoherent Filesets 
  *   XCoherent stands for 'Extra Coherent' (same orientation, or same position)
  */
+
 class GDCM_EXPORT SerieHelper  : public RefCounter
 {
    gdcmTypeMacro(SerieHelper);
    
 public:
    /// SingleSerieUIDFileSetmap replaces the former CoherentFileListmap
-   /// ( List were actually std::vectors, and where no coherent at all :
+   /// (List were actually std::vectors, and where no coherent at all :
    ///   They were only Single SeriesInstanceUID File sets)
    typedef std::map<std::string, FileList *> SingleSerieUIDFileSetmap;