Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / setup / AddressLevelParser.php

diff --git a/lib/setup/AddressLevelParser.php b/lib/setup/AddressLevelParser.php
index 8667424383169173a6ddf7df29c87107d1a6598d..920924287342dfb8b83eda50dcfdb299b6b6e862 100644 (file)
--- a/lib/setup/AddressLevelParser.php
+++ b/lib/setup/AddressLevelParser.php
@@ -53,21 +53,21 @@ class AddressLevelParser
      */
     public function createTable($oDB, $sTable)
     {
      */
     public function createTable($oDB, $sTable)
     {

-        chksql($oDB->query('DROP TABLE IF EXISTS '.$sTable));
+        chksql($oDB->exec('DROP TABLE IF EXISTS '.$sTable));

         $sSql = 'CREATE TABLE '.$sTable;
         $sSql .= '(country_code varchar(2), class TEXT, type TEXT,';
         $sSql .= ' rank_search SMALLINT, rank_address SMALLINT)';
         $sSql = 'CREATE TABLE '.$sTable;
         $sSql .= '(country_code varchar(2), class TEXT, type TEXT,';
         $sSql .= ' rank_search SMALLINT, rank_address SMALLINT)';

-        chksql($oDB->query($sSql));
+        chksql($oDB->exec($sSql));

 
         $sSql = 'CREATE UNIQUE INDEX ON '.$sTable.'(country_code, class, type)';
 
         $sSql = 'CREATE UNIQUE INDEX ON '.$sTable.'(country_code, class, type)';

-        chksql($oDB->query($sSql));
+        chksql($oDB->exec($sSql));

 
         $sSql = 'INSERT INTO '.$sTable.' VALUES ';
         foreach ($this->aLevels as $aLevel) {
             $aCountries = array();
             if (isset($aLevel['countries'])) {
                 foreach ($aLevel['countries'] as $sCountry) {
 
         $sSql = 'INSERT INTO '.$sTable.' VALUES ';
         foreach ($this->aLevels as $aLevel) {
             $aCountries = array();
             if (isset($aLevel['countries'])) {
                 foreach ($aLevel['countries'] as $sCountry) {

-                    $aCountries[$sCountry] = getDBQuoted($sCountry);
+                    $aCountries[$sCountry] = $oDB->getDBQuoted($sCountry);

                 }
             } else {
                 $aCountries['NULL'] = 'NULL';
                 }
             } else {
                 $aCountries['NULL'] = 'NULL';


@@ -75,8 +75,8 @@ class AddressLevelParser
             foreach ($aLevel['tags'] as $sKey => $aValues) {
                 foreach ($aValues as $sValue => $mRanks) {
                     $aFields = array(
             foreach ($aLevel['tags'] as $sKey => $aValues) {
                 foreach ($aValues as $sValue => $mRanks) {
                     $aFields = array(

-                        getDBQuoted($sKey),
-                        $sValue ? getDBQuoted($sValue) : 'NULL'
+                        $oDB->getDBQuoted($sKey),
+                        $sValue ? $oDB->getDBQuoted($sValue) : 'NULL'

                     );
                     if (is_array($mRanks)) {
                         $aFields[] = (string) $mRanks[0];
                     );
                     if (is_array($mRanks)) {
                         $aFields[] = (string) $mRanks[0];


@@ -93,6 +93,6 @@ class AddressLevelParser
                 }
             }
         }
                 }
             }
         }

-        chksql($oDB->query(rtrim($sSql, ',')));
+        chksql($oDB->exec(rtrim($sSql, ',')));

     }
 }
     }
 }