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

Format of replicate-sequence URL has changed

Browse Source 
Additionally update/init import_status in the DB. If this is not
initialized here, subsequent updates of the status won't work.
This commit is contained in:
Sarah Hoffmann
2012-04-15 17:45:01 +02:00
parent 5f036d9923
commit 653c05329d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/setup.php
View File

@@ -360,17 +360,27 @@
if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date'])) if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date']))
{ {
$bDidSomething = true; $bDidSomething = true;
$oDB =& getDB();
if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis"); if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis");
if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n"; if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";
else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings'); else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
$sDate = $aCMDResult['osmosis-init-date']; $sDate = $aCMDResult['osmosis-init-date'];
$sURL = 'http://toolserver.org/~mazder/replicate-sequences/?'.$sDate; $aDate = date_parse_from_format("Y-m-d\TH-i", $sDate);
$sURL = 'http://toolserver.org/~mazder/replicate-sequences/?';
$sURL .= 'Y='.$aDate['year'].'&m='.$aDate['month'].'&d='.$aDate['day'];
$sURL .= '&H='.$aDate['hour'].'&i='.$aDate['minute'].'&s=0';
$sURL .= '&stream=minute';
echo "Getting state file: $sURL\n"; echo "Getting state file: $sURL\n";
$sStateFile = file_get_contents($sURL); $sStateFile = file_get_contents($sURL);
if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file"); if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile); file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
echo "Updating DB status\n";
pg_query($oDB->connection, 'TRUNCATE import_status');
$sSQL = "INSERT INTO import_status VALUES('".$sDate."')";
pg_query($oDB->connection, $sSQL);
} }
if ($aCMDResult['index'] || $aCMDResult['all']) if ($aCMDResult['index'] || $aCMDResult['all'])