travis: make sure to start with fresh template for DB tests

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

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index f03085f8c39159c11f9a94607768f285286cec3c..0f96bc8bdccba6d46ae10d2cffc49e73f92a33e4 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -2,6 +2,8 @@
 
 namespace Nominatim\Setup;
 
 
 namespace Nominatim\Setup;
 

+require_once(CONST_BasePath.'/lib/setup/AddressLevelParser.php');
+

 class SetupFunctions
 {
     protected $iCacheMemory;
 class SetupFunctions
 {
     protected $iCacheMemory;


@@ -272,6 +274,9 @@ class SetupFunctions
         if ($bReverseOnly) {
             $this->pgExec('DROP TABLE search_name');
         }
         if ($bReverseOnly) {
             $this->pgExec('DROP TABLE search_name');
         }

+
+        $oAlParser = new AddressLevelParser(CONST_Address_Level_Config);
+        $oAlParser->createTable($this->oDB, 'address_levels');

     }
 
     public function createPartitionTables()
     }
 
     public function createPartitionTables()


@@ -703,15 +708,17 @@ class SetupFunctions
             if (!$bFound) array_push($aDropTables, $sTable);
         }
         foreach ($aDropTables as $sDrop) {
             if (!$bFound) array_push($aDropTables, $sTable);
         }
         foreach ($aDropTables as $sDrop) {

-            if ($this->sVerbose) echo "dropping table $sDrop\n";
+            if ($this->sVerbose) echo "Dropping table $sDrop\n";

             @pg_query($this->oDB->connection, "DROP TABLE $sDrop CASCADE");
             // ignore warnings/errors as they might be caused by a table having
             // been deleted already by CASCADE
         }
 
         if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
             @pg_query($this->oDB->connection, "DROP TABLE $sDrop CASCADE");
             // ignore warnings/errors as they might be caused by a table having
             // been deleted already by CASCADE
         }
 
         if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {

-            if ($sVerbose) echo 'deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
-            unlink(CONST_Osm2pgsql_Flatnode_File);
+            if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
+                if ($this->sVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
+                unlink(CONST_Osm2pgsql_Flatnode_File);
+            }

         }
     }
 
         }
     }