...

[phys/latlib.git] / configcache.cpp

diff --git a/configcache.cpp b/configcache.cpp
index 48c31f4b559ff929be02c51931d14064de31bf2d..3d160a98ad8f22863daae9f1c7ada67c48e2c5e2 100644 (file)
--- a/configcache.cpp
+++ b/configcache.cpp
@@ -5,7 +5,7 @@
 #include <time.h>
 #include <dirent.h>
 
 #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){
+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;
   NEQUI = nequi;
   NSKIP = nskip;
   DATADIR = datadir;


@@ -20,6 +20,8 @@ configcache::configcache(const string& cacheid, const int& nequi, const int& nsk
   outBuffer = NULL;
   inBuffer = NULL;
 
   outBuffer = NULL;
   inBuffer = NULL;
 

+  MODE = cachemode;
+

   refetchDataFiles = false;
 }
 
   refetchDataFiles = false;
 }
 


@@ -71,8 +73,8 @@ bool configcache::isValidInFile(const string& infile)
       switch(iPart)
        {
        case 1: if(inParts != CACHEID) return false; break;
       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, "_");
     }
        }
       inParts = strtok( NULL, "_");
     }


@@ -87,7 +89,7 @@ bool configcache::isValidInFile(const string& infile)
 
 bool configcache::readConfig()
 {
 
 bool configcache::readConfig()
 {

-  if(DATADIR == "") return false;
+  if(DATADIR == "" || MODE == CACHE_MODE_DISABLED) return false;

 
   if(refetchDataFiles){
     refetchDataFiles = false;
 
   if(refetchDataFiles){
     refetchDataFiles = false;


@@ -124,7 +126,7 @@ bool configcache::readConfig()
 
 void configcache::writeConfig()
 {
 
 void configcache::writeConfig()
 {

-  if( DATADIR == "") return;
+  if( DATADIR == "" || MODE < 2 ) return;

 
   if(!outFile.is_open()){
     time_t secstamp = time(NULL);
 
   if(!outFile.is_open()){
     time_t secstamp = time(NULL);