From 37b49da152cb9287b684fcdea314250ce09bee47 Mon Sep 17 00:00:00 2001
From: Ralf Gerlich <ralf.gerlich@custom-scenery.org>
Date: Tue, 18 Dec 2007 18:19:47 +0100
Subject: [PATCH] Added a flag to fgfs-tools-client that allows enforcing only
 generation of missing buckets.

---
 src/BuildTiles/Parallel/client.cxx | 31 +++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/BuildTiles/Parallel/client.cxx b/src/BuildTiles/Parallel/client.cxx
index e68a3485..3e6705cc 100644
--- a/src/BuildTiles/Parallel/client.cxx
+++ b/src/BuildTiles/Parallel/client.cxx
@@ -46,6 +46,7 @@ SG_USING_STD(vector);
 string work_base = ".";
 string output_base = ".";
 vector<string> load_dirs;
+bool do_overwrite = true;
 
 
 // check if it is ok to run
@@ -176,6 +177,30 @@ long int get_next_task( const string& host, int port, long int last_tile ) {
     return -1;
 }
 
+static bool file_exists( const string& file ) {
+    struct stat buf;
+
+    if ( stat( file.c_str(), &buf ) == 0 ) {
+	return true;
+    } else {
+	return false;
+    }
+}
+
+// check if the tile really has to be generated
+static bool must_generate( const SGBucket& b ) {
+    if (do_overwrite)
+            return true;
+    
+    string btg_file = output_base + "/" + b.gen_base_path()
+	+ "/" + b.gen_index_str() + ".btg.gz";
+    if ( file_exists( btg_file ) ) {
+	return false;
+    }
+
+    return true;
+}
+
 
 // build the specified tile, return true if contruction completed
 // successfully
@@ -225,6 +250,7 @@ usage (const string name)
   cout << "  --host=<address>" << endl;
   cout << "  --port=<number>" << endl;
   cout << "  --rude" << endl;
+  cout << "  --no-overwrite" << endl;
   cout << "  --cover=<landcover-raster>" << endl;
   cout << "<load directory...>" << endl;
   exit(-1);
@@ -256,6 +282,8 @@ int main(int argc, char *argv[]) {
 	port = atoi(arg.substr(7).c_str());
       } else if (arg == "--rude") {
 	rude = true;
+      } else if (arg == "--no-overwrite") {
+	do_overwrite = true;
       } else if (arg.find("--cover=") == 0) {
 	cover = arg.substr(8);
       } else if (arg.find("--") == 0) {
@@ -296,7 +324,8 @@ int main(int argc, char *argv[]) {
     check_master_switch();
 
     while ( (tile = get_next_task( host, port, last_tile )) >= 0 ) {
-	result = construct_tile( SGBucket(tile), result_file, cover );
+        SGBucket bucket(tile);
+        result=!must_generate(bucket) || construct_tile( bucket, result_file, cover );
 	if ( result ) {
 	    last_tile = tile;
 	} else {