Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

[platal.git] / upgrade / 1.0.1 / merge_issues_geocoding.php

diff --git a/upgrade/1.0.1/merge_issues_geocoding.php b/upgrade/1.0.1/merge_issues_geocoding.php
index 8ec2ba3..6f9016e 100755 (executable)
--- a/upgrade/1.0.1/merge_issues_geocoding.php
+++ b/upgrade/1.0.1/merge_issues_geocoding.php
@@ -18,13 +18,12 @@ $it = XDB::rawIterator('SELECT  *
                       ORDER BY  pid, jobid, type, id');
 $total = $it->total();
 $i = 0;
-$j = 0;
 printf("\r%u / %u",  $i, $total);
 $pid = 0;
 $jobid = 0;
 while ($item = $it->next()) {
     $address = new Address($item);
-    $address->format(array(true, true));
+    $address->format(array('requireGeocoding' => true, 'stripGeocoding' => true));
     $address->delete();
     $address->save();
     if (!($pid == $address->pid && $jobid == $address->jobid)) {
@@ -34,13 +33,8 @@ while ($item = $it->next()) {
     }
 
     ++$i;
-    ++$j;
-    if ($j == 10) {
-        $j = 0;
-        printf("\r%u / %u",  $i, $total);
-    }
+    printf("\r%u / %u",  $i, $total);
 }
-printf("\r%u / %u",  $i, $total);
 print "\nGeocoding done.\n\n";
 print "That's all folks!\n";