Milenko wrote the following on 30/11/2007 08:42:
Not sure why it checks three times for files to upload, but it always does that right before it dies.
Still not found what is causing the windows client to stop although the better debugging output in r5828 is helping thanks.

What I have found is the cause of some of the extra upload attempts.

In tilesGen.pl, (sub uploadIfEnoughTiles) the code checks for the existence of zip files to upload with:

   $ZipCount++ if ($File =~ /\.zip/);

Assuming you conf option is DeleteZipFilesAfterUpload=0 then this check is finding the already uploaded files eg (1196236964_2728_0_tile_tileset.zip_uploaded)

Suggest changing to :

           $ZipCount++ if ($File =~ /\.zip$/);

Diff file attached.

Tested on windows only.

Note that under normal loop mode this is not a problem as there is usually zip files to upload anyway, but if it gets comms problems and starts looping in order to retry then this is causing unnecessary calls to upload.pl as there is nothing to upload.

rcr
Index: tilesGen.pl
===================================================================
--- tilesGen.pl (revision 5839)
+++ tilesGen.pl (working copy)
@@ -325,7 +325,7 @@
     {
         while(my $File = readdir($dp))
         {
-            $ZipCount++ if ($File =~ /\.zip/);
+            $ZipCount++ if ($File =~ /\.zip$/);
         }
         closedir($dp);
     }
_______________________________________________
Tilesathome mailing list
[email protected]
http://lists.openstreetmap.org/cgi-bin/mailman/listinfo/tilesathome

Reply via email to