From: jean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Date: Mon, 18 May 2009 17:33:08 +0000 (+0000)
Subject: Try double check
X-Git-Tag: CREATOOLS.2-0-3~54
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0bc6c532e6f065b3b6664c7c6fa831b68757dea5;p=creaBruker.git

Try double check
(boost doesn't works on Andres' PC
?!?
---

diff --git a/lib/src1/bruker2dicom.cxx b/lib/src1/bruker2dicom.cxx
index 74df353..7371311 100644
--- a/lib/src1/bruker2dicom.cxx
+++ b/lib/src1/bruker2dicom.cxx
@@ -128,6 +128,7 @@ bool Bruker2Dicom::Execute()
          it != fileNames.end();
        ++it)
    {
+      if ( !boost::filesystem::is_regular(*it) ) // check twice !
       if ( boost::filesystem::is_directory(*it) )
       { 
          if (verbose)
@@ -222,7 +223,8 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr
         it != fileNames.end();
       ++it)
    {
-      if ( ! boost::filesystem::is_directory(*it) )
+      if ( boost::filesystem::is_regular(*it) ) 
+      //if ( ! boost::filesystem::is_directory(*it) )
       {
          if (verbose)
             std::cout << "--- [" << *it << "] is a file" << std::endl;
@@ -236,6 +238,7 @@ void Bruker2Dicom::DealWithNiveau1(std::string level1Directory, std::string curr
         it != fileNames.end();
       ++it)
    {
+      if ( !boost::filesystem::is_regular(*it) ) // check twice !  
       if ( boost::filesystem::is_directory(*it) )
       {
          // will be always "pdata" ...
@@ -332,7 +335,8 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr
         it != fileNames.end();
       ++it)
    {
-      if ( ! boost::filesystem::is_directory(*it) )
+      if ( !boost::filesystem::is_regular(*it) ) 
+      //if ( ! boost::filesystem::is_directory(*it) )
       { 
          std::cout << "--- --- [" << *it << "] is a file" << std::endl;
       }
@@ -343,6 +347,7 @@ void Bruker2Dicom::DealWithNiveau2(std::string level2Directory, std::string curr
          it != fileNames.end();
        ++it)
    {
+      if ( !boost::filesystem::is_regular(*it) ) // check twice !
       if ( boost::filesystem::is_directory(*it) )
       { 
   
@@ -816,7 +821,8 @@ void Bruker2Dicom::dealWithCarto(GDCM_NAME_SPACE::DirListType &fileNames, int NX
         it != fileNames.end();
       ++it)
    {
-      if ( ! boost::filesystem::is_directory(*it) )
+      if ( boost::filesystem::is_regular(*it) )
+      //if ( ! boost::filesystem::is_directory(*it) )
       {         
          if (verbose)
             std::cout << "--- [" << *it << "] is a file" << std::endl;
@@ -934,7 +940,7 @@ bool Bruker2Dicom::CreateDirectory(std::string OutputDirName)
    
    if (verbose)
       std::cout << "Check for output directory :[" << OutputDirName << "]."
-                <<std::endl;
+                <<std::endl;		
    if ( ! boost::filesystem::is_directory(OutputDirName) )    // dirout not found
    {
       std::string strDirNameout(OutputDirName);        // to please gcc 4