X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/5adde094541b74abf79a902dc4b63141d281b818..3eb3a1c16cd9d9f76a21d29194301cd69f77eca6:/configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 1c4aa05..3d160a9 100644
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -4,9 +4,8 @@
 #include <iostream>
 #include <time.h>
 #include <dirent.h>
-#include <string.h>
 
-configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize){
+configcache::configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, const int& cachemode){
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;
@@ -21,6 +20,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   outBuffer = NULL;
   inBuffer = NULL;
 
+  MODE = cachemode;
+
   refetchDataFiles = false;
 }
 
@@ -72,8 +73,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, "_");
     }
@@ -81,14 +82,14 @@ bool configcache::isValidInFile(const string& infile)
 
   delete[] inchar;
 
-  if( truncIn.find( getFileId(true) ) == string::npos ) return false;
+  if( truncIn.find( getFileId(true) + "_" ) == string::npos ) return false;
 
   return true;
 }
 
 bool configcache::readConfig()
 {
-  if(DATADIR == "") return false;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;
 
   if(refetchDataFiles){
     refetchDataFiles = false;
@@ -125,13 +126,13 @@ bool configcache::readConfig()
 
 void configcache::writeConfig()
 {
-  if( DATADIR == "") return;
+  if( DATADIR == "" || MODE < 2 ) return;
 
   if(!outFile.is_open()){
     time_t secstamp = time(NULL);
 
     outFileName.str("");
-    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << ".dat.tmp";    
+    outFileName << DATADIR << "/" << secstamp << "_" << getFileId() << "_.dat.tmp";    
     outFile.open( outFileName.str().c_str(), std::ios::binary );
 
     outBuffer = new boost::iostreams::filtering_ostreambuf;