safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

make missing osmosis non-fatal for 'all' option - just skip it

Browse Source
This commit is contained in:
Brian Quinion
2013-09-06 10:58:48 +01:00
parent 437a7ce50e
commit d8f9b27c93
1 changed files with 70 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/setup.php
View File

@@ -502,8 +502,13 @@
if (!file_exists(CONST_Osmosis_Binary)) if (!file_exists(CONST_Osmosis_Binary))
{ {
echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n"; echo "Please download osmosis.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
if (!$aCMDResult['all'])
{
fail("osmosis not found in '".CONST_Osmosis_Binary."'"); fail("osmosis not found in '".CONST_Osmosis_Binary."'");
} }
}
else
{
if (file_exists(CONST_BasePath.'/settings/configuration.txt')) if (file_exists(CONST_BasePath.'/settings/configuration.txt'))
{ {
echo "settings/configuration.txt already exists\n"; echo "settings/configuration.txt already exists\n";
@@ -525,7 +530,6 @@
preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate); preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
$iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60); $iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
// Search for the correct state file - uses file timestamps so need to sort by date descending // Search for the correct state file - uses file timestamps so need to sort by date descending
$sRepURL = CONST_Replication_Url."/"; $sRepURL = CONST_Replication_Url."/";
$sRep = file_get_contents($sRepURL."?C=M;O=D"); $sRep = file_get_contents($sRepURL."?C=M;O=D");
@@ -572,6 +576,7 @@
$sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')"; $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
pg_query($oDB->connection, $sSQL); pg_query($oDB->connection, $sSQL);
} }
}
if ($aCMDResult['index'] || $aCMDResult['all']) if ($aCMDResult['index'] || $aCMDResult['all'])
{ {