comparison data/fileio/CachedFile.cpp @ 1527:710e6250a401 zoom

Merge from default branch

 
             if (retrieve()) {
                 SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl;
                 updateLastRetrieval(true);
             } else {
-                cerr << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl;
+                SVCERR << "CachedFile::check: Retrieval failed, will try again later (using existing file for now)" << endl;
             }                
         }
     } else {
         SVDEBUG << "CachedFile::check: No valid last retrieval" << endl;
         // there is no acceptable file
         if (retrieve()) {
             SVDEBUG << "CachedFile::check: Retrieval succeeded" << endl;
             m_ok = true;
             updateLastRetrieval(true);
         } else {
-            cerr << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl;
+            SVCERR << "CachedFile::check: Retrieval failed, remaining in invalid state" << endl;
             // again, we don't need to do anything here -- the last
             // retrieval timestamp is already invalid
         }
     }
 

     }
 
     QFile previous(m_localFilename);
     if (previous.exists()) {
         if (!previous.remove()) {
-            cerr << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl;
+            SVCERR << "CachedFile::retrieve: ERROR: Failed to remove previous copy of cached file at \"" << m_localFilename << "\"" << endl;
             return false;
         }
     }
 
     //!!! This is not ideal, could leave us with nothing (old file
     //!!! removed, new file not able to be copied in because e.g. no
     //!!! disk space left)
 
     if (!tempFile.copy(m_localFilename)) {
-        cerr << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl;
+        SVCERR << "CachedFile::retrieve: ERROR: Failed to copy newly retrieved file from \"" << tempName << "\" to \"" << m_localFilename << "\"" << endl;
         return false;
     }
 
     SVDEBUG << "CachedFile::retrieve: Successfully copied newly retrieved file \"" << tempName << "\" to its home at \"" << m_localFilename << "\"" << endl;