X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/eb0b3bfa4cd74ee9e425c54868a30d8859e694cd..08e273c0c7ebcbb7f8e4c512c58b22da1bac95b7:/utils/update.php diff --git a/utils/update.php b/utils/update.php old mode 100755 new mode 100644 index 27c538c1..c1dc2ab9 --- a/utils/update.php +++ b/utils/update.php @@ -1,23 +1,30 @@ -#!/usr/bin/php -Cq connect(); -$aDSNInfo = DB::parseDSN(CONST_Database_DSN); +$aDSNInfo = Nominatim\DB::parseDSN(CONST_Database_DSN); if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; // cache memory to be used by osm2pgsql, should not be more than the available memory @@ -52,15 +65,107 @@ if ($iCacheMemory + 500 > getTotalMemoryMB()) { $iCacheMemory = getCacheMemoryMB(); echo "WARNING: resetting cache memory to $iCacheMemory\n"; } -$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port']; -if (!is_null(CONST_Osm2pgsql_Flatnode_File)) { +$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -S '.CONST_Import_Style.' -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port']; +if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { + $sOsm2pgsqlCmd .= ' -U ' . $aDSNInfo['username']; +} +if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { + $sOsm2pgsqlCmd .= ' -H ' . $aDSNInfo['hostspec']; +} +$aProcEnv = null; +if (isset($aDSNInfo['password']) && $aDSNInfo['password']) { + $aProcEnv = array_merge(array('PGPASSWORD' => $aDSNInfo['password']), $_ENV); +} + +if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) { $sOsm2pgsqlCmd .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File; } +$sIndexCmd = CONST_BasePath.'/nominatim/nominatim.py'; +if (!$aResult['quiet']) { + $sIndexCmd .= ' -v'; +} +if ($aResult['verbose']) { + $sIndexCmd .= ' -v'; +} + +if ($aResult['init-updates']) { + // sanity check that the replication URL is correct + $sBaseState = file_get_contents(CONST_Replication_Url.'/state.txt'); + if ($sBaseState === false) { + echo "\nCannot find state.txt file at the configured replication URL.\n"; + echo "Does the URL point to a directory containing OSM update data?\n\n"; + fail('replication URL not reachable.'); + } + // sanity check for pyosmium-get-changes + if (!CONST_Pyosmium_Binary) { + echo "\nCONST_Pyosmium_Binary not configured.\n"; + echo "You need to install pyosmium and set up the path to pyosmium-get-changes\n"; + echo "in your local settings file.\n\n"; + fail('CONST_Pyosmium_Binary not configured'); + } + $aOutput = 0; + $sCmd = CONST_Pyosmium_Binary.' --help'; + exec($sCmd, $aOutput, $iRet); + if ($iRet != 0) { + echo "Cannot execute pyosmium-get-changes.\n"; + echo "Make sure you have pyosmium installed correctly\n"; + echo "and have set up CONST_Pyosmium_Binary to point to pyosmium-get-changes.\n"; + fail('pyosmium-get-changes not found or not usable'); + } + + if (!$aResult['no-update-functions']) { + // instantiate setupClass to use the function therein + $cSetup = new SetupFunctions(array( + 'enable-diff-updates' => true, + 'verbose' => $aResult['verbose'] + )); + $cSetup->connect(); + $cSetup->createFunctions(); + } + + $sDatabaseDate = getDatabaseDate($oDB); + if (!$sDatabaseDate) { + fail('Cannot determine date of database.'); + } + $sWindBack = strftime('%Y-%m-%dT%H:%M:%SZ', strtotime($sDatabaseDate) - (3*60*60)); + + // get the appropriate state id + $aOutput = 0; + $sCmd = CONST_Pyosmium_Binary.' -D '.$sWindBack.' --server '.CONST_Replication_Url; + exec($sCmd, $aOutput, $iRet); + if ($iRet != 0 || $aOutput[0] == 'None') { + fail('Error running pyosmium tools'); + } + + $oDB->exec('TRUNCATE import_status'); + $sSQL = "INSERT INTO import_status (lastimportdate, sequence_id, indexed) VALUES('"; + $sSQL .= $sDatabaseDate."',".$aOutput[0].', true)'; + + try { + $oDB->exec($sSQL); + } catch (\Nominatim\DatabaseError $e) { + fail('Could not enter sequence into database.'); + } + + echo "Done. Database updates will start at sequence $aOutput[0] ($sWindBack)\n"; +} + +if ($aResult['check-for-updates']) { + $aLastState = $oDB->getRow('SELECT sequence_id FROM import_status'); + + if (!$aLastState['sequence_id']) { + fail('Updates not set up. Please run ./utils/update.php --init-updates.'); + } + + system(CONST_BasePath.'/utils/check_server_for_updates.py '.CONST_Replication_Url.' '.$aLastState['sequence_id'], $iRet); + exit($iRet); +} + +if (isset($aResult['import-diff']) || isset($aResult['import-file'])) { + // import diffs and files directly (e.g. from osmosis --rri) + $sNextFile = isset($aResult['import-diff']) ? $aResult['import-diff'] : $aResult['import-file']; -if (isset($aResult['import-diff'])) { - // import diff directly (e.g. from osmosis --rri) - $sNextFile = $aResult['import-diff']; if (!file_exists($sNextFile)) { fail("Cannot open $sNextFile\n"); } @@ -68,7 +173,7 @@ if (isset($aResult['import-diff'])) { // Import the file $sCMD = $sOsm2pgsqlCmd.' '.$sNextFile; echo $sCMD."\n"; - exec($sCMD, $sJunk, $iErrorLevel); + $iErrorLevel = runWithEnv($sCMD, $aProcEnv); if ($iErrorLevel) { fail("Error from osm2pgsql, $iErrorLevel\n"); @@ -77,258 +182,316 @@ if (isset($aResult['import-diff'])) { // Don't update the import status - we don't know what this file contains } -$sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc'; -$bHaveDiff = false; -if (isset($aResult['import-file']) && $aResult['import-file']) { - $bHaveDiff = true; - $sCMD = CONST_Osmosis_Binary.' --read-xml \''.$aResult['import-file'].'\' --read-empty --derive-change --write-xml-change '.$sTemporaryFile; - echo $sCMD."\n"; - exec($sCMD, $sJunk, $iErrorLevel); - if ($iErrorLevel) { - fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n"); - } +if ($aResult['calculate-postcodes']) { + info('Update postcodes centroids'); + $sTemplate = file_get_contents(CONST_BasePath.'/sql/update-postcodes.sql'); + runSQLScript($sTemplate, true, true); } +$sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc'; +$bHaveDiff = false; $bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api']; $sContentURL = ''; if (isset($aResult['import-node']) && $aResult['import-node']) { if ($bUseOSMApi) { - $sContentURL = 'http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']; + $sContentURL = 'https://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;'; } } if (isset($aResult['import-way']) && $aResult['import-way']) { if ($bUseOSMApi) { - $sContentURL = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full'; + $sContentURL = 'https://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full'; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;'; } } if (isset($aResult['import-relation']) && $aResult['import-relation']) { if ($bUseOSMApi) { - $sContentURLsModifyXMLstr = 'http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; + $sContentURLsModifyXMLstr = 'https://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full'; } else { - $sContentURL = 'http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;'; + $sContentURL = 'https://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;'; } } if ($sContentURL) { - $sModifyXMLstr = file_get_contents($sContentURL); + file_put_contents($sTemporaryFile, file_get_contents($sContentURL)); $bHaveDiff = true; - - $aSpec = array( - 0 => array("pipe", "r"), // stdin - 1 => array("pipe", "w"), // stdout - 2 => array("pipe", "w") // stderr - ); - $sCMD = CONST_Osmosis_Binary.' --read-xml - --read-empty --derive-change --write-xml-change '.$sTemporaryFile; - echo $sCMD."\n"; - $hProc = proc_open($sCMD, $aSpec, $aPipes); - if (!is_resource($hProc)) { - fail("Error converting osm to osc, osmosis failed\n"); - } - fwrite($aPipes[0], $sModifyXMLstr); - fclose($aPipes[0]); - $sOut = stream_get_contents($aPipes[1]); - if ($aResult['verbose']) echo $sOut; - fclose($aPipes[1]); - $sErrors = stream_get_contents($aPipes[2]); - if ($aResult['verbose']) echo $sErrors; - fclose($aPipes[2]); - if ($iError = proc_close($hProc)) { - echo $sOut; - echo $sErrors; - fail("Error converting osm to osc, osmosis returned: $iError\n"); - } } if ($bHaveDiff) { // import generated change file $sCMD = $sOsm2pgsqlCmd.' '.$sTemporaryFile; echo $sCMD."\n"; - exec($sCMD, $sJunk, $iErrorLevel); + $iErrorLevel = runWithEnv($sCMD, $aProcEnv); if ($iErrorLevel) { fail("osm2pgsql exited with error level $iErrorLevel\n"); } } if ($aResult['deduplicate']) { - // - if (getPostgresVersion() < 9.3) { - fail("ERROR: deduplicate is only currently supported in postgresql 9.3"); + $oDB = new Nominatim\DB(); + $oDB->connect(); + + if ($oDB->getPostgresVersion() < 9.3) { + fail('ERROR: deduplicate is only currently supported in postgresql 9.3'); } - $oDB =& getDB(); $sSQL = 'select partition from country_name order by country_code'; - $aPartitions = chksql($oDB->getCol($sSQL)); + $aPartitions = $oDB->getCol($sSQL); $aPartitions[] = 0; - $sSQL = "select word_token,count(*) from word where substr(word_token, 1, 1) = ' ' and class is null and type is null and country_code is null group by word_token having count(*) > 1 order by word_token"; - $aDuplicateTokens = chksql($oDB->getAll($sSQL)); + // we don't care about empty search_name_* partitions, they can't contain mentions of duplicates + foreach ($aPartitions as $i => $sPartition) { + $sSQL = 'select count(*) from search_name_'.$sPartition; + $nEntries = $oDB->getOne($sSQL); + if ($nEntries == 0) { + unset($aPartitions[$i]); + } + } + + $sSQL = "select word_token,count(*) from word where substr(word_token, 1, 1) = ' '"; + $sSQL .= ' and class is null and type is null and country_code is null'; + $sSQL .= ' group by word_token having count(*) > 1 order by word_token'; + $aDuplicateTokens = $oDB->getAll($sSQL); foreach ($aDuplicateTokens as $aToken) { if (trim($aToken['word_token']) == '' || trim($aToken['word_token']) == '-') continue; - echo "Deduping ".$aToken['word_token']."\n"; - $sSQL = "select word_id,(select count(*) from search_name where nameaddress_vector @> ARRAY[word_id]) as num from word where word_token = '".$aToken['word_token']."' and class is null and type is null and country_code is null order by num desc"; - $aTokenSet = chksql($oDB->getAll($sSQL)); + echo 'Deduping '.$aToken['word_token']."\n"; + $sSQL = 'select word_id,'; + $sSQL .= ' (select count(*) from search_name where nameaddress_vector @> ARRAY[word_id]) as num'; + $sSQL .= " from word where word_token = '".$aToken['word_token']; + $sSQL .= "' and class is null and type is null and country_code is null order by num desc"; + $aTokenSet = $oDB->getAll($sSQL); $aKeep = array_shift($aTokenSet); $iKeepID = $aKeep['word_id']; foreach ($aTokenSet as $aRemove) { - $sSQL = "update search_name set"; - $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID."),"; - $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]"; - chksql($oDB->query($sSQL)); - - $sSQL = "update search_name set"; - $sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]"; - chksql($oDB->query($sSQL)); - - $sSQL = "update location_area_country set"; - $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; - chksql($oDB->query($sSQL)); + $sSQL = 'update search_name set'; + $sSQL .= ' name_vector = array_replace(name_vector,'.$aRemove['word_id'].','.$iKeepID.'),'; + $sSQL .= ' nameaddress_vector = array_replace(nameaddress_vector,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where name_vector @> ARRAY['.$aRemove['word_id'].']'; + $oDB->exec($sSQL); + + $sSQL = 'update search_name set'; + $sSQL .= ' nameaddress_vector = array_replace(nameaddress_vector,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where nameaddress_vector @> ARRAY['.$aRemove['word_id'].']'; + $oDB->exec($sSQL); + + $sSQL = 'update location_area_country set'; + $sSQL .= ' keywords = array_replace(keywords,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where keywords @> ARRAY['.$aRemove['word_id'].']'; + $oDB->exec($sSQL); foreach ($aPartitions as $sPartition) { - $sSQL = "update search_name_".$sPartition." set"; - $sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]"; - chksql($oDB->query($sSQL)); - - $sSQL = "update location_area_country set"; - $sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")"; - $sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]"; - chksql($oDB->query($sSQL)); + $sSQL = 'update search_name_'.$sPartition.' set'; + $sSQL .= ' name_vector = array_replace(name_vector,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where name_vector @> ARRAY['.$aRemove['word_id'].']'; + $oDB->exec($sSQL); + + $sSQL = 'update location_area_country set'; + $sSQL .= ' keywords = array_replace(keywords,'.$aRemove['word_id'].','.$iKeepID.')'; + $sSQL .= ' where keywords @> ARRAY['.$aRemove['word_id'].']'; + $oDB->exec($sSQL); } - $sSQL = "delete from word where word_id = ".$aRemove['word_id']; - chksql($oDB->query($sSQL)); + $sSQL = 'delete from word where word_id = '.$aRemove['word_id']; + $oDB->exec($sSQL); } } } +if ($aResult['recompute-word-counts']) { + info('Recompute frequency of full-word search terms'); + $sTemplate = file_get_contents(CONST_BasePath.'/sql/words_from_search_name.sql'); + runSQLScript($sTemplate, true, true); +} + if ($aResult['index']) { - passthru(CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']); + $sCmd = $sIndexCmd + .' -d '.$aDSNInfo['database'] + .' -P '.$aDSNInfo['port'] + .' -t '.$aResult['index-instances'] + .' -r '.$aResult['index-rank']; + if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { + $sCmd .= ' -H ' . $aDSNInfo['hostspec']; + } + if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { + $sCmd .= ' -U ' . $aDSNInfo['username']; + } + + runWithEnv($sCmd, $aProcEnv); + + $oDB->exec('update import_status set indexed = true'); +} + +if ($aResult['update-address-levels']) { + echo 'Updating address levels from '.CONST_Address_Level_Config.".\n"; + $oAlParser = new \Nominatim\Setup\AddressLevelParser(CONST_Address_Level_Config); + $oAlParser->createTable($oDB, 'address_levels'); +} + +if ($aResult['recompute-importance']) { + echo "Updating importance values for database.\n"; + $oDB = new Nominatim\DB(); + $oDB->connect(); + + $sSQL = 'ALTER TABLE placex DISABLE TRIGGER ALL;'; + $sSQL .= 'UPDATE placex SET (wikipedia, importance) ='; + $sSQL .= ' (SELECT wikipedia, importance'; + $sSQL .= ' FROM compute_importance(extratags, country_code, osm_type, osm_id));'; + $sSQL .= 'UPDATE placex s SET wikipedia = d.wikipedia, importance = d.importance'; + $sSQL .= ' FROM placex d'; + $sSQL .= ' WHERE s.place_id = d.linked_place_id and d.wikipedia is not null'; + $sSQL .= ' and (s.wikipedia is null or s.importance < d.importance);'; + $sSQL .= 'ALTER TABLE placex ENABLE TRIGGER ALL;'; + $oDB->exec($sSQL); } if ($aResult['import-osmosis'] || $aResult['import-osmosis-all']) { // if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) { - fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n"); + fail('Error: Update interval too low for download.geofabrik.de. ' . + "Please check install documentation (http://nominatim.org/release-docs/latest/Import-and-Update#setting-up-the-update-process)\n"); } - $sImportFile = CONST_BasePath.'/data/osmosischange.osc'; - $sOsmosisConfigDirectory = CONST_InstallPath.'/settings'; - $sCMDDownload = CONST_Osmosis_Binary.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile; - $sCMDCheckReplicationLag = CONST_Osmosis_Binary.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory; + $sImportFile = CONST_InstallPath.'/osmosischange.osc'; + $sCMDDownload = CONST_Pyosmium_Binary.' --server '.CONST_Replication_Url.' -o '.$sImportFile.' -s '.CONST_Replication_Max_Diff_size; $sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile; - $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances']; + $sCMDIndex = $sIndexCmd + .' -d '.$aDSNInfo['database'] + .' -P '.$aDSNInfo['port'] + .' -t '.$aResult['index-instances']; + if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) { + $sCMDIndex .= ' -H ' . $aDSNInfo['hostspec']; + } + if (isset($aDSNInfo['username']) && $aDSNInfo['username']) { + $sCMDIndex .= ' -U ' . $aDSNInfo['username']; + } while (true) { $fStartTime = time(); - $iFileSize = 1001; - - if (!file_exists($sImportFile)) { - // First check if there are new updates published (except for minutelies - there's always new diffs to process) - if (CONST_Replication_Update_Interval > 60) { - unset($aReplicationLag); - exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); - while ($iErrorLevel > 0 || $aReplicationLag[0] < 1) { - if ($iErrorLevel) { - echo "Error: $iErrorLevel. "; - echo "Re-trying: ".$sCMDCheckReplicationLag." in ".CONST_Replication_Recheck_Interval." secs\n"; - } else { - echo "."; - } + $aLastState = $oDB->getRow('SELECT *, EXTRACT (EPOCH FROM lastimportdate) as unix_ts FROM import_status'); + + if (!$aLastState['sequence_id']) { + echo "Updates not set up. Please run ./utils/update.php --init-updates.\n"; + exit(1); + } + + echo 'Currently at sequence '.$aLastState['sequence_id'].' ('.$aLastState['lastimportdate'].') - '.$aLastState['indexed']." indexed\n"; + + $sBatchEnd = $aLastState['lastimportdate']; + $iEndSequence = $aLastState['sequence_id']; + + if ($aLastState['indexed']) { + // Sleep if the update interval has not yet been reached. + $fNextUpdate = $aLastState['unix_ts'] + CONST_Replication_Update_Interval; + if ($fNextUpdate > $fStartTime) { + $iSleepTime = $fNextUpdate - $fStartTime; + echo "Waiting for next update for $iSleepTime sec."; + sleep($iSleepTime); + } + + // Download the next batch of changes. + do { + $fCMDStartTime = time(); + $iNextSeq = (int) $aLastState['sequence_id']; + unset($aOutput); + echo "$sCMDDownload -I $iNextSeq\n"; + if (file_exists($sImportFile)) { + unlink($sImportFile); + } + exec($sCMDDownload.' -I '.$iNextSeq, $aOutput, $iResult); + + if ($iResult == 3) { + echo 'No new updates. Sleeping for '.CONST_Replication_Recheck_Interval." sec.\n"; sleep(CONST_Replication_Recheck_Interval); - unset($aReplicationLag); - exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); + } elseif ($iResult != 0) { + echo 'ERROR: updates failed.'; + exit($iResult); + } else { + $iEndSequence = (int)$aOutput[0]; } - // There are new replication files - use osmosis to download the file - echo "\n".date('Y-m-d H:i:s')." Replication Delay is ".$aReplicationLag[0]."\n"; + } while ($iResult); + + // get the newest object from the diff file + $sBatchEnd = 0; + $iRet = 0; + exec(CONST_BasePath.'/utils/osm_file_date.py '.$sImportFile, $sBatchEnd, $iRet); + if ($iRet == 5) { + echo "Diff file is empty. skipping import.\n"; + if (!$aResult['import-osmosis-all']) { + exit(0); + } else { + continue; + } + } + if ($iRet != 0) { + fail('Error getting date from diff file.'); } - $fStartTime = time(); + $sBatchEnd = $sBatchEnd[0]; + + // Import the file $fCMDStartTime = time(); - echo $sCMDDownload."\n"; - exec($sCMDDownload, $sJunk, $iErrorLevel); - while ($iErrorLevel > 0) { - echo "Error: $iErrorLevel\n"; - sleep(60); - echo 'Re-trying: '.$sCMDDownload."\n"; - exec($sCMDDownload, $sJunk, $iErrorLevel); + echo $sCMDImport."\n"; + unset($sJunk); + $iErrorLevel = runWithEnv($sCMDImport, $aProcEnv); + if ($iErrorLevel) { + echo "Error executing osm2pgsql: $iErrorLevel\n"; + exit($iErrorLevel); } + + // write the update logs $iFileSize = filesize($sImportFile); - $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory); - $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','osmosis')"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,$iFileSize,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= date('Y-m-d H:i:s')."','import')"; var_Dump($sSQL); - $oDB->query($sSQL); - echo date('Y-m-d H:i:s')." Completed osmosis step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; - } + $oDB->exec($sSQL); - $iFileSize = filesize($sImportFile); - $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory); - - // Import the file - $fCMDStartTime = time(); - echo $sCMDImport."\n"; - exec($sCMDImport, $sJunk, $iErrorLevel); - if ($iErrorLevel) { - echo "Error: $iErrorLevel\n"; - exit($iErrorLevel); + // update the status + $sSQL = "UPDATE import_status SET lastimportdate = '$sBatchEnd', indexed=false, sequence_id = $iEndSequence"; + var_Dump($sSQL); + $oDB->exec($sSQL); + echo date('Y-m-d H:i:s')." Completed download step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; } - $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','osm2pgsql')"; - var_Dump($sSQL); - $oDB->query($sSQL); - echo date('Y-m-d H:i:s')." Completed osm2pgsql step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; - - // Archive for debug? - unlink($sImportFile); - - $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory); // Index file - $sThisIndexCmd = $sCMDIndex; - $fCMDStartTime = time(); - if (!$aResult['no-index']) { + $sThisIndexCmd = $sCMDIndex; + $fCMDStartTime = time(); + echo "$sThisIndexCmd\n"; - exec($sThisIndexCmd, $sJunk, $iErrorLevel); + $iErrorLevel = runWithEnv($sThisIndexCmd, $aProcEnv); if ($iErrorLevel) { echo "Error: $iErrorLevel\n"; exit($iErrorLevel); } - } - $sSQL = "INSERT INTO import_osmosis_log values ('$sBatchEnd',$iFileSize,'".date('Y-m-d H:i:s', $fCMDStartTime)."','".date('Y-m-d H:i:s')."','index')"; - var_Dump($sSQL); - $oDB->query($sSQL); - echo date('Y-m-d H:i:s')." Completed index step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; + $sSQL = 'INSERT INTO import_osmosis_log'; + $sSQL .= '(batchend, batchseq, batchsize, starttime, endtime, event)'; + $sSQL .= " values ('$sBatchEnd',$iEndSequence,NULL,'"; + $sSQL .= date('Y-m-d H:i:s', $fCMDStartTime)."','"; + $sSQL .= date('Y-m-d H:i:s')."','index')"; + var_Dump($sSQL); + $oDB->exec($sSQL); + echo date('Y-m-d H:i:s')." Completed index step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60, 2)." minutes\n"; - $sSQL = "update import_status set lastimportdate = '$sBatchEnd'"; - $oDB->query($sSQL); + $sSQL = 'update import_status set indexed = true'; + $oDB->exec($sSQL); + } else { + if ($aResult['import-osmosis-all']) { + echo "Error: --no-index cannot be used with continuous imports (--import-osmosis-all).\n"; + exit(1); + } + } $fDuration = time() - $fStartTime; echo date('Y-m-d H:i:s')." Completed all for $sBatchEnd in ".round($fDuration/60, 2)." minutes\n"; if (!$aResult['import-osmosis-all']) exit(0); - - if (CONST_Replication_Update_Interval > 60) { - $iSleep = max(0, (strtotime($sBatchEnd)+CONST_Replication_Update_Interval-time())); - } else { - $iSleep = max(0, CONST_Replication_Update_Interval-$fDuration); - } - echo date('Y-m-d H:i:s')." Sleeping $iSleep seconds\n"; - sleep($iSleep); } } - -function getosmosistimestamp($sOsmosisConfigDirectory) -{ - $sStateFile = file_get_contents($sOsmosisConfigDirectory.'/state.txt'); - preg_match('#timestamp=(.+)#', $sStateFile, $aResult); - return str_replace('\:', ':', $aResult[1]); -}