From: Stéphane Jacob <sj@m4x.org>
Date: Mon, 3 Jan 2011 11:49:07 +0000 (+0100)
Subject: Fixes errors in geocoder.
X-Git-Tag: xorg/1.0.2~44
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=491f402b146b0ccd235fdc53cb8292462d5c1a3c;p=platal.git

Fixes errors in geocoder.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/classes/geocoder.php b/classes/geocoder.php
index bec39cc..ccbddc7 100644
--- a/classes/geocoder.php
+++ b/classes/geocoder.php
@@ -42,7 +42,7 @@ abstract class Geocoder {
         static $extras = array(
             'subAdministrativeArea' => array(
                 'field' => 'administrativearea',
-                'name'  => 'administrativeAreaName')
+                'name'  => 'administrativeAreaName'
             )
         );
 
@@ -50,7 +50,7 @@ abstract class Geocoder {
         $areaNameLocal = $areaName . 'Local';
         $areaId = $area . 'Id';
         if (!is_null($address->$areaName) && isset($databases[$area])) {
-            $extra = (isset($extras[$area]) ? $extras[$area]['administrativeAreaName'] : false;
+            $extra = (isset($extras[$area]) ? $extras[$area]['administrativeAreaName'] : false);
 
             $res = XDB::query('SELECT  id, nameLocal
                                  FROM  ' . $databases[$area] . '
@@ -61,7 +61,7 @@ abstract class Geocoder {
                                            ($extra ? ', ' . $extras[$area]['field'] : '') . ')
                                    VALUES  ({?}, {?}, {?}' . ($extra ? ', {?}' : '') . ')',
                              $address->$areaName, $address->$areaNameLocal, $address->countryId,
-                             ($extra ? $address->$extra : null);
+                             ($extra ? $address->$extra : null));
                 $address->$areaId = XDB::insertId();
             } else {
                 // XXX: remove this once all areas have both nameLocal and name.
@@ -85,7 +85,7 @@ abstract class Geocoder {
     {
         $textArray  = explode("\n", $text);
         for ($i = 0; $i < count($textArray); ++$i) {
-            if ($i > $limit || strpos($textLine, $postalCode) !== false) {
+            if ($i > $limit || strpos($textArray[$i], $postalCode) !== false) {
                 $limit = $i;
                 break;
             }