added o815

[phys/latlib.git] / configcache.h

diff --git a/configcache.h b/configcache.h
index 139218b9cbf3b11c7ea6582cea2cc5f83ae4f1f4..f07ccf50f1cb51ae682f5dc17425fa4e70285243 100644 (file)
--- a/configcache.h
+++ b/configcache.h
@@ -38,13 +38,16 @@ class configcache{
   ~configcache();
   configcache(const string& cacheid, const int& nequi, const int& nskip, const string& datadir, char **configmem, const int& configMemSize, 
              const int& cachemode=CACHE_MODE_FULL, writeout *out_a=NULL);
-  bool readConfig();
+  int readConfig(vector<unsigned long> *excludeFileHashes=NULL);
   void writeConfig();
   void addPara(const string& parid, const double& val=0);
   void setPara(const string& parid, const double& value);
-  void writeHeader(char *header, const int& size);
-  void *getHeader();
-  
+  void writeHeader(const string& headerid, const char *header, long unsigned int size);
+  void * getHeader(const string& headerid);
+  string getOutFileName() { return outFileName.str(); }
+  string getInFileName() { return DATADIR + "/" + openFileDesc.filename; }
+  static unsigned long hash(const string& str);
+
  private:
   infiledesc openFileDesc;
   void finishOutFile();
@@ -87,11 +90,18 @@ class configcache{
   int readDataToMem(char *tmpData, long unsigned int dataSize);
 
   void openOutFile();
-  bool openInFile();
 
-  char *headerData;
+  int readHeader();
+
+  bool headerWritten;
+
+  int readFullBlock(char *tmpData, long unsigned int dataSize);
+
+  vector< pair<unsigned long, void *> > headerStore;
+
+  void deleteHeaderStore();
 
-  void readHeader();
+  bool readAllHeaders();
 };
 
 #endif