X-Git-Url: http://git.treefish.org/~alex/phys/latlib.git/blobdiff_plain/2e2c5c148405f6b0c68608083204c2c1854adcfd..f46daea04f594f9f386ac6514733ec1eff860462:/configcache.h?ds=inline

diff --git a/configcache.h b/configcache.h
index 3c521d9..82fa3f6 100644
--- a/configcache.h
+++ b/configcache.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <fstream>
 #include <sstream>
+#include <ostream>
 
 #include <boost/iostreams/filtering_streambuf.hpp>
 #include <boost/iostreams/stream.hpp>
@@ -12,8 +13,6 @@
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/copy.hpp>
 
-#include "writeout.h"
-
 #define CACHE_MODE_DISABLED 0
 #define CACHE_MODE_READ 1
 #define CACHE_MODE_FULL 2
@@ -37,15 +36,21 @@ class configcache{
  public:
   ~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();
+	      const int& cachemode=CACHE_MODE_FULL, ostream *_log=NULL);
+  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(const string& headerid, char *header, long unsigned int size);
+  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);
+  void closeInFile() { inFile.close(); }
+  int inFilesLeft() { return inFiles.size(); }
+
  private:
+  ostream* log;
   infiledesc openFileDesc;
   void finishOutFile();
   int getParIndex(const string& parid);
@@ -59,8 +64,6 @@ class configcache{
   ofstream outFile;
   ifstream inFile;
 
-  writeout *out;
-
   stringstream outFileName;
 
   int readnum;
@@ -94,13 +97,13 @@ class configcache{
 
   int readFullBlock(char *tmpData, long unsigned int dataSize);
 
-  static unsigned long hash(const string& str);
-
   vector< pair<unsigned long, void *> > headerStore;
 
   void deleteHeaderStore();
 
   bool readAllHeaders();
+
+  vector<infiledesc>::iterator getNextInfile(vector<unsigned long> *excludeFileHashes);
 };
 
 #endif