Forgot to update this one

[gdcm.git] / src / gdcmSerieHelper.cxx

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 8d800cea5c626f2eda30e068e3ee2ef406f1bf4c..16616963b698c1c38ca51dad6d38e43ef2c62afa 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: 2007/06/08 12:49:37 $
-  Version:   $Revision: 1.57 $
+  Date:      $Date: 2007/07/05 09:34:12 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -455,7 +455,7 @@ XCoherentFileSetmap SerieHelper::SplitOnOrientation(FileList *fileSet)
    std::ostringstream ossOrient;
 
    FileList::const_iterator it = fileSet->begin();
-   it ++;
+   //it ++;
    for ( ;
          it != fileSet->end();
        ++it)
@@ -505,7 +505,7 @@ XCoherentFileSetmap SerieHelper::SplitOnPosition(FileList *fileSet)
    std::ostringstream ossPosition;
    std::string strPosition; // re computed
    FileList::const_iterator it = fileSet->begin();
-   it ++;
+   //it ++;
    for ( ;
          it != fileSet->end();
        ++it)
@@ -581,7 +581,7 @@ XCoherentFileSetmap SerieHelper::SplitOnTagValue(FileList *fileSet,
    std::string strTagValue;  // read on disc
 
    FileList::const_iterator it = fileSet->begin();
-   it ++;
+   //it ++;
    for ( ;
          it != fileSet->end();
        ++it)
@@ -1049,7 +1049,7 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File * inFile )
       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')))
@@ -1061,7 +1061,8 @@ std::string SerieHelper::CreateUserDefinedFileIdentifier( File * inFile )
       id += s.c_str();
       id += "%%%"; // make the FileIdentifier Tokenizable
    }
-   
+   id += inFile->GetFileName();
+   id += "%%%"; 
    return id;             
 }