X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOTreeHandlerImageAdder.cpp;h=ae72e444a750219bc13bf1f75b4a23ab73dc63af;hb=refs%2Fheads%2FchangestoITK3and4;hp=33f6dd80a42b991ba66d0263f54dd4c302c3a052;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git diff --git a/src/creaImageIOTreeHandlerImageAdder.cpp b/src/creaImageIOTreeHandlerImageAdder.cpp index 33f6dd8..ae72e44 100644 --- 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<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::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() ); } } } @@ -481,7 +481,7 @@ namespace creaImageIO AddFile(*i); } } - nf+=newFiles.size(); + nf+=(int)newFiles.size(); newFiles.clear(); }