fix variable name in setup --drop

This commit is contained in:
Sarah Hoffmann
2018-11-24 12:29:00 +01:00
parent 71ef94dae6
commit 14cef94e61

View File

@@ -703,15 +703,17 @@ class SetupFunctions
if (!$bFound) array_push($aDropTables, $sTable); if (!$bFound) array_push($aDropTables, $sTable);
} }
foreach ($aDropTables as $sDrop) { 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"); @pg_query($this->oDB->connection, "DROP TABLE $sDrop CASCADE");
// ignore warnings/errors as they might be caused by a table having // ignore warnings/errors as they might be caused by a table having
// been deleted already by CASCADE // been deleted already by CASCADE
} }
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) { if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
if ($sVerbose) echo 'deleting '.CONST_Osm2pgsql_Flatnode_File."\n"; if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
unlink(CONST_Osm2pgsql_Flatnode_File); if ($this->sVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
unlink(CONST_Osm2pgsql_Flatnode_File);
}
} }
} }