File name

[gdcm.git] / Example / SplitIntoDirectories.cxx

diff --git a/Example/SplitIntoDirectories.cxx b/Example/SplitIntoDirectories.cxx
index 4632f69ad407157e436147a3a024a7334b646984..14077f6b2dabadf6f4040d5b83d581c8a5860026 100755 (executable)
--- a/Example/SplitIntoDirectories.cxx
+++ b/Example/SplitIntoDirectories.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: SplitIntoDirectories.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/04/20 11:14:48 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2011/04/22 12:30:08 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -354,8 +354,8 @@ int main(int argc, char *argv[])
       ///this is a trick to build up a lexicographical compliant name :
       ///     eg : fich001.ima vs fich100.ima as opposed to fich1.ima vs fich100.ima
       std::string name = GDCM_NAME_SPACE::Util::GetName( *it );
-
-      std::cout << "name :[" << name << "]\n";
+      if (verbose)
+         std::cout << "name :[" << name << "]\n";
 
       if (hasSkel)
       {
@@ -435,17 +435,17 @@ int main(int argc, char *argv[])
       GDCM_NAME_SPACE::Util::Tokenize (it2->first, tokens, token);
       
       currentPatientName            = tokens[IND_PatientName];
-      currentStudyInstanceUID       = tokens[IND_StudyInstanceUID];      
+      currentStudyInstanceUID       = tokens[IND_StudyInstanceUID];     
       currentSerieInstanceUID       = tokens[IND_SerieInstanceUID];
       currentSerieDescription       = tokens[IND_SerieDescription];
       currentSerieNumber            = tokens[IND_SerieNumber];
-             
+
       if (previousPatientName != currentPatientName)
       {  
          previousPatientName = currentPatientName;
          if (verbose)   
             std::cout << "==== new Patient  [" << currentPatientName  << "]" << std::endl;
-    
+
          previousPatientName            = currentPatientName;
          previousStudyInstanceUID       = ""; 
          previousSerieInstanceUID       = "";
@@ -474,9 +474,8 @@ int main(int argc, char *argv[])
            std::cout << "[" << systemCommand << "]" << std::endl;         
          else            
             system (systemCommand.c_str());
-
       }  
-      
+
       if (previousSerieInstanceUID != currentSerieInstanceUID)
       {        
          previousSerieInstanceUID       = currentSerieInstanceUID;
@@ -487,11 +486,13 @@ int main(int argc, char *argv[])
          if (seriedescr) // more human readable!
             currentSerieWriteDir  = currentStudyWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
                                   + currentSerieDescription + "_" + currentSerieNumber
-                                  + "_" + currentSerieInstanceUID;
+                                  /*+ "_" + currentSerieInstanceUID */
+                                  ;
+
          else
             currentSerieWriteDir  = currentStudyWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR
                                   + currentSerieInstanceUID;         
-                      
+   
          systemCommand   = "mkdir \"" + currentSerieWriteDir + "\"";
          
          if (listonly)
@@ -510,7 +511,7 @@ int main(int argc, char *argv[])
       fullWriteFilename = currentSerieWriteDir + GDCM_NAME_SPACE::GDCM_FILESEPARATOR 
                                          + lastFilename; 
 
-      systemCommand   = "cp \"" + fullFilename + "\"" + " \"" + fullWriteFilename + " \"";
+      systemCommand   = "cp \"" + fullFilename + "\"  \"" + fullWriteFilename + "\"";
       
       if (listonly)
          std::cout << "[" << systemCommand << "]" << std::endl;         
@@ -520,4 +521,3 @@ int main(int argc, char *argv[])
    }
    return 0;
  }
-