X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/027b93b16fe0d77104e0e711377c5728b0934035..d52c5bf5d9fcc8c3decb9af47428cbab7ef18052:/configcache.cpp?ds=sidebyside

diff --git a/configcache.cpp b/configcache.cpp
index f3c02de..3a76a55 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,7 +5,10 @@
 #include <time.h>
 #include <dirent.h>
 
-configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode){
+configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode,
+			 writeout *out_a){
+  out = out_a;
+
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
@@ -73,8 +76,8 @@ bool configcache::isValidInFile(const string& infile)
       switch(iPart)
 	{
 	case 1: if(inParts != CACHEID) return false; break;
-	case 2: if(atoi(inParts) < NEQUI) return false; break;
-	case 3: if(atoi(inParts) < NSKIP) return false; break;
+	case 2: if(atoi(inParts) != NEQUI) return false; break;
+	case 3: if(atoi(inParts) != NSKIP) return false; break;
 	}
       inParts = strtok( NULL, "_");
     }
@@ -102,6 +105,9 @@ bool configcache::readConfig()
 
       while( (!inFile.is_open()) && inFiles.size() > 0 )
 	{
+	  if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
+
+	  openFileName = inFiles.back();
 	  inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
 	  inFiles.pop_back();
 
@@ -114,12 +120,30 @@ bool configcache::readConfig()
 
       if( inFile.is_open() ) 
 	{
-	  if( boost::iostreams::read(*inBuffer, tmpConfig, configSize) == configSize )
+	  int readturn = -1;
+	  try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, configSize); }
+	  catch(boost::iostreams::bzip2_error& error) { 
+	    if(out) *out->log << "CCACHE: Caught bzip2 exception with error code: " << error.error() << endl << flush;
+	    inFile.close();
+	  } 
+	  catch (std::exception const& ex) {
+	    if(out) *out->log << "CCACHE: Caught exception: " << ex.what() << endl << flush;
+	    inFile.close();
+	  }
+	  catch( ... ) {
+	    if(out) *out->log << "CCACHE: Caught unknown exception while reading." << endl << flush;
+	    inFile.close();
+	  }
+	  
+	  if( readturn == configSize && inFile.is_open() )
 	    {
 	      memcpy(configMem, tmpConfig, configSize);
 	      return true;
 	    }
-	  else inFile.close();
+	  else {
+	    *out->log << "CCACHE: Closing dat-file: " << openFileName << endl << flush;
+	    inFile.close();
+	  }
 	}
     }
 }