Bug 1805:

[creaImageIO.git] / src / creaImageIOTreeHandlerImageAdder.cpp

diff --git a/src/creaImageIOTreeHandlerImageAdder.cpp b/src/creaImageIOTreeHandlerImageAdder.cpp
index 33f6dd80a42b991ba66d0263f54dd4c302c3a052..ff4683d13d61c012832e617ae3bcb3135e4948d1 100644 (file)
--- a/src/creaImageIOTreeHandlerImageAdder.cpp
+++ b/src/creaImageIOTreeHandlerImageAdder.cpp
@@ -239,20 +239,20 @@ namespace creaImageIO
          {
            if (recursive) 
                {
-                       AddDirectoryRecursorScanner( itr->string(), recursive, addKey, i_sc, true);
+                       AddDirectoryRecursorScanner( itr->path().string(), recursive, addKey, i_sc, true);
                }
          }
        else 
          {
                std::string parent_id;
                // tTest if directory (and only it) exists or not.
-               bool valid = mSynchronizer->isIndexed(itr->string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB);
+               bool valid = mSynchronizer->isIndexed(itr->path().string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB);
                if(valid)
                {
-                       std::string path(itr->string());
+                       std::string path(itr->path().string());
                        mProgress.IncNumberScannedFiles();
                         boost::algorithm::replace_all( path,INVALID_FILE_SEPARATOR,VALID_FILE_SEPARATOR);
-                       i_sc.ReadAttributes(itr->string(),attr);
+                       i_sc.ReadAttributes(itr->path().string(),attr);
                //      mTreeHandler->GetTopLevelNodeId("FullFileName",itr->string(),parent_id);
                        mTreeHandler->AddBranch(attr);
                        mProgress.IncNumberHandledFiles();
@@ -296,25 +296,25 @@ namespace creaImageIO
          {
            if (recursive) 
                {
-                       AddDirectoryRecursor( itr->string(), recursive, addKey);
+                       AddDirectoryRecursor( itr->path().string(), recursive, addKey);
                }
          }
        else 
          {
                std::string parent_id;
                // tTest if directory (and only it) exists or not.
-               bool valid = mSynchronizer->isIndexed(itr->string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB);
+               bool valid = mSynchronizer->isIndexed(itr->path().string());//true;//=mTimestampHandler->AddDirectory(dirpath, itr->string(), lastModif, time(0),mCurrentDB);
                if(valid)
                {
                        mProgress.IncNumberScannedFiles();
-                       if (IsHandledFile(itr->string()))
+                       if (IsHandledFile(itr->path().string()))
                        {
                        mProgress.IncNumberHandledFiles();
-                       AddFile( itr->string() );
+                       AddFile( itr->path().string() );
                        //mTreeHandler->GetTopLevelNodeId("FullFileName",itr->string(),parent_id);
                        std::stringstream removedOn;
                        removedOn<<time(0);
-                       mSynchronizer->InsertIgnoreFile(addKey, itr->string(),"0",removedOn.str(),mCurrentDB);
+                       mSynchronizer->InsertIgnoreFile(addKey, itr->path().string(),"0",removedOn.str(),mCurrentDB);
                        }
                        
                        mProgressSignal(mProgress);
@@ -352,17 +352,17 @@ namespace creaImageIO
         {
             if (recursive)
                        {
-                CheckSyncDirectory( itr->string(), recursive, repair, checkAttributes, i_ignorefiles, attsModified, newfiles);
+                CheckSyncDirectory( itr->path().string(), recursive, repair, checkAttributes, i_ignorefiles, attsModified, newfiles);
                        }
         }
         else
         {
-            if (IsHandledFile(itr->string()))
+            if (IsHandledFile(itr->path().string()))
             {
                 bool bfound = false;
                 for(std::vector<std::string>::iterator it_new = i_ignorefiles.begin(); it_new < i_ignorefiles.end(); ++it_new)
                 {
-                                       if((*it_new) == itr->string())
+                                       if((*it_new) == itr->path().string())
                     {
                         bfound = true;
                                                //Additional checking of attributes
@@ -376,7 +376,7 @@ namespace creaImageIO
                                }
                                if(!bfound && i_ignorefiles.size()>0 )
                 {
-                    newfiles.push_back( itr->string() );
+                    newfiles.push_back( itr->path().string() );
                 }
                        }
                }