showUsage($aCMDOptions, true, 'Select either import of hourly or daily');
}
- if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
if (!isset($aResult['index-rank'])) $aResult['index-rank'] = 0;
/*
// Lock to prevent multiple copies running
if (exec('/bin/ps uww | grep '.basename(__FILE__).' | grep -v /dev/null | grep -v grep -c', $aOutput2, $iResult) > 1)
{
- echo "Copy already running\n";
- exit;
+ fail("Copy already running\n");
}
if (!isset($aResult['max-load'])) $aResult['max-load'] = 1.9;
if (!isset($aResult['max-blocking'])) $aResult['max-blocking'] = 3;
if (getBlockingProcesses() > $aResult['max-blocking'])
{
- echo "Too many blocking processes for import\n";
- exit;
+ fail("Too many blocking processes for import\n");
}
*/
$sNextFile = $aResult['import-diff'];
if (!file_exists($sNextFile))
{
- echo "Cannot open $sNextFile\n";
- exit;
+ fail("Cannot open $sNextFile\n");
}
// Don't update the import status - we don't know what this file contains
$sUpdateSQL = 'update import_status set lastimportdate = now() where false';
if ($iErrorLevel)
{
- echo "Error from osm2pgsql, $iErrorLevel\n";
- exit;
+ fail("Error from osm2pgsql, $iErrorLevel\n");
}
// Move the date onwards
exec($sCMD, $sJunk, $iErrorLevel);
if ($iErrorLevel)
{
- echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n";
- exit;
+ fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n");
}
}
else
$hProc = proc_open($sCMD, $aSpec, $aPipes);
if (!is_resource($hProc))
{
- echo "Error converting osm to osc, osmosis failed\n";
- exit;
+ fail("Error converting osm to osc, osmosis failed\n");
}
fwrite($aPipes[0], $sModifyXMLstr);
fclose($aPipes[0]);
echo "Error converting osm to osc, osmosis returned: $iError\n";
echo $sOut;
echo $sErrors;
- exit;
+ exit(-1);
}
}
exec($sCMD, $sJunk, $iErrorLevel);
if ($iErrorLevel)
{
- echo "osm2pgsql exited with error level $iErrorLevel\n";
- exit;
+ fail("osm2pgsql exited with error level $iErrorLevel\n");
}
}
$pgver = (float) CONST_Postgresql_Version;
if ($pgver < 9.3) {
- echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
- exit;
+ fail("ERROR: deduplicate is only currently supported in postgresql 9.3");
}
$oDB =& getDB();
if (PEAR::isError($aTokenSet))
{
var_dump($aTokenSet, $sSQL);
- exit;
+ exit(1);
}
$aKeep = array_shift($aTokenSet);
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
$sSQL = "update search_name set";
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
$sSQL = "update location_area_country set";
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
foreach ($aPartitions as $sPartition)
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
$sSQL = "update location_area_country set";
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
}
if (PEAR::isError($x))
{
var_dump($x);
- exit;
+ exit(1);
}
}
if ($aResult['index'])
{
+ if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
}
{
if (strpos(CONST_Replication_Url, 'download.geofabrik.de') !== false && CONST_Replication_Update_Interval < 86400) {
- echo "Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n";
- exit;
+ fail("Error: Update interval too low for download.geofabrik.de. Please check install documentation (http://wiki.openstreetmap.org/wiki/Nominatim/Installation#Updates)\n");
}
$sImportFile = CONST_BasePath.'/data/osmosischange.osc';
$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
- $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+ $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
if (!$aResult['no-npi']) {
$sCMDIndex .= '-F ';
}
$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
// Index file
- $sThisIndexCmd = $sCMDIndex;
+ if (!isset($aResult['index-instances']))
+ {
+ if (getLoadAverage() < 24)
+ $iIndexInstances = 2;
+ else
+ $iIndexInstances = 1;
+ } else
+ $iIndexInstances = $aResult['index-instances'];
+
+ $sThisIndexCmd = $sCMDIndex.' -t '.$iIndexInstances;
$fCMDStartTime = time();
if (!$aResult['no-npi'])
$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;
+ if (!$aResult['import-osmosis-all']) exit(0);
if ( CONST_Replication_Update_Interval > 60 )
{
if (PEAR::isError($iNPIID))
{
var_dump($iNPIID);
- exit;
+ exit(1);
}
$sConfigDirectory = CONST_BasePath.'/settings';
$sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
exec($sCMDImport, $sJunk, $iErrorLevel);
if ($iErrorLevel)
{
- echo "Error: $iErrorLevel\n";
- exit;
+ fail("Error: $iErrorLevel\n");
}
$sBatchEnd = $iNPIID;
echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
projects / nominatim.git / blobdiff