refined exceptions.

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index f00e187b26a339825256e09dde80257dda123b2f..3a76a555d1f2a0f08aad9932a087e385ae26c5e4 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -107,21 +107,12 @@ bool configcache::readConfig()
        {
          if(out) *out->log << "CCACHE: Opening dat-file: " << inFiles.back() << endl << flush;
 
        {
          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();
 
          if( !inFile.is_open() ) continue;
 
          inFile.open( (DATADIR + "/" + inFiles.back()).c_str(), std::ios::binary );
          inFiles.pop_back();
 
          if( !inFile.is_open() ) continue;
 

-         std::streampos fsize = inFile.tellg();
-          inFile.seekg( 0, std::ios::end );
-          fsize = inFile.tellg() - fsize;
-         if( (int)fsize == 0 ) {
-           *out->log << "CCACHE: dat-file has zero length! Skipping." << endl << flush;
-           inFile.close();
-           continue;
-         }
-         inFile.seekg(0);
-

          inBuffer = new boost::iostreams::filtering_istreambuf;
          inBuffer->push( boost::iostreams::bzip2_decompressor() );
          inBuffer->push(inFile);
          inBuffer = new boost::iostreams::filtering_istreambuf;
          inBuffer->push( boost::iostreams::bzip2_decompressor() );
          inBuffer->push(inFile);


@@ -131,17 +122,28 @@ bool configcache::readConfig()
        {
          int readturn = -1;
          try { readturn = boost::iostreams::read(*inBuffer, tmpConfig, 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 (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;
            }
          
          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();
+         }

        }
     }
 }
        }
     }
 }