Check for valid data files. Implements #224

Extractor/ExtractionContainers.cpp

@@ -121,6 +121,7 @@ void ExtractionContainers::PrepareData(const std::string & output_file_name, con
         //serialize restrictions
         std::ofstream restrictionsOutstream;
         restrictionsOutstream.open(restrictionsFileName.c_str(), std::ios::binary);
+        restrictionsOutstream.write((char*)&uuid, sizeof(UUID));
         restrictionsOutstream.write((char*)&usableRestrictionsCounter, sizeof(unsigned));
         for(restrictionsIT = restrictionsVector.begin(); restrictionsIT != restrictionsVector.end(); ++restrictionsIT) {
             if(UINT_MAX != restrictionsIT->restriction.fromNode && UINT_MAX != restrictionsIT->restriction.toNode) {
@@ -131,6 +132,7 @@ void ExtractionContainers::PrepareData(const std::string & output_file_name, con
 
         std::ofstream fout;
         fout.open(output_file_name.c_str(), std::ios::binary);
+        fout.write((char*)&uuid, sizeof(UUID));
         fout.write((char*)&usedNodeCounter, sizeof(unsigned));
         time = get_timestamp();
         std::cout << "[extractor] Confirming/Writing used nodes     ... " << std::flush;
@@ -158,7 +160,7 @@ void ExtractionContainers::PrepareData(const std::string & output_file_name, con
 
         std::cout << "[extractor] setting number of nodes   ... " << std::flush;
         std::ios::pos_type positionInFile = fout.tellp();
-        fout.seekp(std::ios::beg);
+        fout.seekp(std::ios::beg+sizeof(UUID));
         fout.write((char*)&usedNodeCounter, sizeof(unsigned));
         fout.seekp(positionInFile);
 

Extractor/ExtractionContainers.h

@@ -23,6 +23,7 @@
 
 #include "ExtractorStructs.h"
 #include "../DataStructures/TimingUtil.h"
+#include "../Util/UUID.h"
 
 #include <boost/foreach.hpp>
 #include <stxxl.h>
@@ -63,7 +64,7 @@ public:
     STXXLStringVector           nameVector;
     STXXLRestrictionsVector     restrictionsVector;
     STXXLWayIDStartEndVector    wayStartEndVector;
-
+    const UUID uuid;
 };
 
 #endif /* EXTRACTIONCONTAINERS_H_ */