X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/2338d04e9f0cd8f0ca294a1f6664d641d1522b25..91e1e4d614edcd13dc19ac1409a9cf812ead964c:/utils/update.php?ds=sidebyside

diff --git a/utils/update.php b/utils/update.php
index 13790450..34d30a4f 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,8 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-        require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
-        ini_set('memory_limit', '800M');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
+	ini_set('memory_limit', '800M');
 
 	$aCMDOptions = array(
 		"Import / update / index osm data",
@@ -10,18 +11,11 @@
 		array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
 		array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
-		array('max-load', '', 0, 1, 1, 1, 'float', 'Maximum load average - indexing is paused if this is exceeded'),
-		array('max-blocking', '', 0, 1, 1, 1, 'int', 'Maximum blocking processes - indexing is aborted / paused if this is exceeded'),
-
 		array('import-osmosis', '', 0, 1, 0, 0, 'bool', 'Import using osmosis'),
 		array('import-osmosis-all', '', 0, 1, 0, 0, 'bool', 'Import using osmosis forever'),
-		array('no-npi', '', 0, 1, 0, 0, 'bool', 'Do not write npi index files'),
+		array('no-npi', '', 0, 1, 0, 0, 'bool', '(obsolate)'),
 		array('no-index', '', 0, 1, 0, 0, 'bool', 'Do not index the new data'),
 
-		array('import-npi-all', '', 0, 1, 0, 0, 'bool', 'Import npi pre-indexed files'),
-
-		array('import-hourly', '', 0, 1, 0, 0, 'bool', 'Import hourly diffs'),
-		array('import-daily', '', 0, 1, 0, 0, 'bool', 'Import daily diffs'),
 		array('import-all', '', 0, 1, 0, 0, 'bool', 'Import all available files'),
 
 		array('import-file', '', 0, 1, 1, 1, 'realpath', 'Re-import data from an OSM file'),
@@ -36,39 +30,14 @@
 		array('index', '', 0, 1, 0, 0, 'bool', 'Index'),
 		array('index-rank', '', 0, 1, 1, 1, 'int', 'Rank to start indexing from'),
 		array('index-instances', '', 0, 1, 1, 1, 'int', 'Number of indexing instances (threads)'),
-		array('index-estrate', '', 0, 1, 1, 1, 'int', 'Estimated indexed items per second (def:30)'),
 
 		array('deduplicate', '', 0, 1, 0, 0, 'bool', 'Deduplicate tokens'),
 	);
 	getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
-	if ($aResult['import-hourly'] + $aResult['import-daily'] + isset($aResult['import-diff']) > 1)
-	{
-		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;
-	}
-	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;
-	}
-*/
-
-	// Assume osm2pgsql is in the folder above
-	$sBasePath = dirname(dirname(__FILE__));
-
 	date_default_timezone_set('Etc/UTC');
 
 	$oDB =& getDB();
@@ -90,185 +59,138 @@
 	}
 
 
-	$bFirst = true;
-	$bContinue = $aResult['import-all'];
-	while ($bContinue || $bFirst)
+	if (isset($aResult['import-diff']))
 	{
-		$bFirst = false;
-
-		if ($aResult['import-hourly'])
+		// import diff directly (e.g. from osmosis --rri)
+		$sNextFile = $aResult['import-diff'];
+		if (!file_exists($sNextFile))
 		{
-			// Mirror the hourly diffs
-			exec('wget --quiet --mirror -l 1 -P '.$sMirrorDir.' http://planet.openstreetmap.org/hourly');
-			$sNextFile = $oDB->getOne('select TO_CHAR(lastimportdate,\'YYYYMMDDHH24\')||\'-\'||TO_CHAR(lastimportdate+\'1 hour\'::interval,\'YYYYMMDDHH24\')||\'.osc.gz\' from import_status');
-			$sNextFile = $sMirrorDir.'planet.openstreetmap.org/hourly/'.$sNextFile;
-			$sUpdateSQL = 'update import_status set lastimportdate = lastimportdate+\'1 hour\'::interval';
+			fail("Cannot open $sNextFile\n");
 		}
 
-		if ($aResult['import-daily'])
-		{
-			// Mirror the daily diffs
-			exec('wget --quiet --mirror -l 1 -P '.$sMirrorDir.' http://planet.openstreetmap.org/daily');
-			$sNextFile = $oDB->getOne('select TO_CHAR(lastimportdate,\'YYYYMMDD\')||\'-\'||TO_CHAR(lastimportdate+\'1 day\'::interval,\'YYYYMMDD\')||\'.osc.gz\' from import_status');
-			$sNextFile = $sMirrorDir.'planet.openstreetmap.org/daily/'.$sNextFile;
-			$sUpdateSQL = 'update import_status set lastimportdate = lastimportdate::date + 1';
-		}
-		
-		if (isset($aResult['import-diff']))
+		// Import the file
+		$sCMD = $sOsm2pgsqlCmd.' '.$sNextFile;
+		echo $sCMD."\n";
+		exec($sCMD, $sJunk, $iErrorLevel);
+
+		if ($iErrorLevel)
 		{
-			// import diff directly (e.g. from osmosis --rri)
-			$sNextFile = $aResult['import-diff'];
-			if (!file_exists($sNextFile))
-			{
-				echo "Cannot open $sNextFile\n";
-				exit;
-			}
-			// Don't update the import status - we don't know what this file contains
-			$sUpdateSQL = 'update import_status set lastimportdate = now() where false';
+			fail("Error from osm2pgsql, $iErrorLevel\n");
 		}
 
-		// Missing file is not an error - it might not be created yet
-		if (($aResult['import-hourly'] || $aResult['import-daily'] || isset($aResult['import-diff'])) && file_exists($sNextFile))
-		{
-			// Import the file
-			$sCMD = $sOsm2pgsqlCmd.' '.$sNextFile;
-			echo $sCMD."\n";
-			exec($sCMD, $sJunk, $iErrorLevel);
+		// Don't update the import status - we don't know what this file contains
+	}
 
-			if ($iErrorLevel)
-			{
-				echo "Error from osm2pgsql, $iErrorLevel\n";
-				exit;
-			}
-	
-			// Move the date onwards
-			$oDB->query($sUpdateSQL);
-		}
-		else
+	$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)
 		{
-			$bContinue = false;
+			fail("Error converting osm to osc, osmosis returned: $iErrorLevel\n");
 		}
 	}
 
-	$bModifyXML = false;
-	$sModifyXMLstr = '';
 	$bUseOSMApi = isset($aResult['import-from-main-api']) && $aResult['import-from-main-api'];
-	if (isset($aResult['import-file']) && $aResult['import-file'])
-	{
-		$bModifyXML = true;
-	}
+	$sContentURL = '';
 	if (isset($aResult['import-node']) && $aResult['import-node'])
 	{
-		$bModifyXML = true;
 		if ($bUseOSMApi)
 		{
-			$sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node']);
+			$sContentURL = 'http://www.openstreetmap.org/api/0.6/node/'.$aResult['import-node'];
 		}
 		else
 		{
-			$sModifyXMLstr = file_get_contents('http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;');
+			$sContentURL = 'http://overpass-api.de/api/interpreter?data=node('.$aResult['import-node'].');out%20meta;';
 		}
 	}
 	if (isset($aResult['import-way']) && $aResult['import-way'])
 	{
-		$bModifyXML = true;
 		if ($bUseOSMApi)
 		{
-			$sCmd = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
+			$sContentURL = 'http://www.openstreetmap.org/api/0.6/way/'.$aResult['import-way'].'/full';
 		}
 		else
 		{
-			$sCmd = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
+			$sContentURL = 'http://overpass-api.de/api/interpreter?data=(way('.$aResult['import-way'].');node(w););out%20meta;';
 		}
-		$sModifyXMLstr = file_get_contents($sCmd);
 	}
 	if (isset($aResult['import-relation']) && $aResult['import-relation'])
 	{
-		$bModifyXML = true;
 		if ($bUseOSMApi)
 		{
-			$sModifyXMLstr = file_get_contents('http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full');
+			$sContentURLsModifyXMLstr = 'http://www.openstreetmap.org/api/0.6/relation/'.$aResult['import-relation'].'/full';
 		}
 		else
 		{
-			$sModifyXMLstr = file_get_contents('http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;');
+			$sContentURL = 'http://overpass-api.de/api/interpreter?data=((rel('.$aResult['import-relation'].');way(r);node(w));node(r));out%20meta;';
 		}
 	}
-	if ($bModifyXML)
+	if ($sContentURL)
 	{
-		// derive change from normal osm file with osmosis
-		$sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc';
-		if (isset($aResult['import-file']) && $aResult['import-file'])
+		$sModifyXMLstr = 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))
 		{
-			$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)
-			{
-				echo "Error converting osm to osc, osmosis returned: $iErrorLevel\n";
-				exit;
-			}
+			fail("Error converting osm to osc, osmosis failed\n");
 		}
-		else
+		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))
 		{
-			$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))
-			{
-				echo "Error converting osm to osc, osmosis failed\n";
-				exit;
-			}
-			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 "Error converting osm to osc, osmosis returned: $iError\n";
-				echo $sOut;
-				echo $sErrors;
-				exit;
-			}
+			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);
 		if ($iErrorLevel)
 		{
-			echo "osm2pgsql exited with error level $iErrorLevel\n";
-			exit;
+			fail("osm2pgsql exited with error level $iErrorLevel\n");
 		}
 	}
 
 	if ($aResult['deduplicate'])
 	{
 
-		$pgver = (float) CONST_Postgresql_Version;
-                if ($pgver < 9.3) {
-			echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
-			exit;
+		if (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 = $oDB->getCol($sSQL);
-                if (PEAR::isError($aPartitions))
-                {
-                        fail($aPartitions->getMessage());
-                }
-                $aPartitions[] = 0;
+		$oDB =& getDB();
+		$sSQL = 'select partition from country_name order by country_code';
+		$aPartitions = $oDB->getCol($sSQL);
+		if (PEAR::isError($aPartitions))
+		{
+			fail($aPartitions->getMessage());
+		}
+		$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 = $oDB->getAll($sSQL);
@@ -281,7 +203,7 @@
 			if (PEAR::isError($aTokenSet))
 			{
 				var_dump($aTokenSet, $sSQL);
-				exit;
+				exit(1);
 			}
 
 			$aKeep = array_shift($aTokenSet);
@@ -297,7 +219,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				$sSQL = "update search_name set";
@@ -307,7 +229,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				$sSQL = "update location_area_country set";
@@ -317,7 +239,7 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 
 				foreach ($aPartitions as $sPartition)
@@ -329,7 +251,7 @@
 					if (PEAR::isError($x))
 					{
 						var_dump($x);
-						exit;
+						exit(1);
 					}
 
 					$sSQL = "update location_area_country set";
@@ -339,7 +261,7 @@
 					if (PEAR::isError($x))
 					{
 						var_dump($x);
-						exit;
+						exit(1);
 					}
 				}
 
@@ -348,113 +270,100 @@
 				if (PEAR::isError($x))
 				{
 					var_dump($x);
-					exit;
+					exit(1);
 				}
 			}
-
 		}
 	}
 
 	if ($aResult['index'])
 	{
-		passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
+		passthru(CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'].' -r '.$aResult['index-rank']);
 	}
 
 	if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
 	{
 
 		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';
-		$sOsmosisCMD = CONST_Osmosis_Binary;
-		$sOsmosisConfigDirectory = CONST_BasePath.'/settings';
-		$sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
-		$sCMDCheckReplicationLag = $sOsmosisCMD.' -q --read-replication-lag workingDirectory='.$sOsmosisConfigDirectory;
+		$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;
 		$sCMDImport = $sOsm2pgsqlCmd.' '.$sImportFile;
-		$sCMDIndex = $sBasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
-		if (!$aResult['no-npi']) {
-			$sCMDIndex .= '-F ';
-		}
+		$sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+
 		while(true)
 		{
 			$fStartTime = time();
 			$iFileSize = 1001;
 
-			// Logic behind this is that osm2pgsql locks the database quite a bit
-			// So it is better to import lots of small files
-			// But indexing works most efficiently on large amounts of data
-			// So do lots of small imports and a BIG index
-
-//			while($aResult['import-osmosis-all'] && $iFileSize > 1000)
-//			{
-				if (!file_exists($sImportFile))
+			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 )
 				{
-					// 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)
+					unset($aReplicationLag);
+					exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
+					while ($iErrorLevel > 0 || $aReplicationLag[0] < 1)
+					{
+						if ($iErrorLevel)
 						{
-							if ($iErrorLevel)
-							{
-								echo "Error: $iErrorLevel. ";
-								echo "Re-trying: ".$sCMDCheckReplicationLag." in ".CONST_Replication_Recheck_Interval." secs\n";
-							}
-							else
-							{
-								echo ".";
-							}
-							sleep(CONST_Replication_Recheck_Interval);
-							unset($aReplicationLag);
-							exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
+							echo "Error: $iErrorLevel. ";
+							echo "Re-trying: ".$sCMDCheckReplicationLag." in ".CONST_Replication_Recheck_Interval." secs\n";
 						}
-						// 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";
-					}
-					$fStartTime = time();
-					$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);
+						else
+						{
+							echo ".";
+						}
+						sleep(CONST_Replication_Recheck_Interval);
+						unset($aReplicationLag);
+						exec($sCMDCheckReplicationLag, $aReplicationLag, $iErrorLevel); 
 					}
-					$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')";
-					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";
+					// 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";
 				}
-
-				$iFileSize = filesize($sImportFile);
-				$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
-		
-				// Import the file
+				$fStartTime = time();
 				$fCMDStartTime = time();
-				echo $sCMDImport."\n";
-				exec($sCMDImport, $sJunk, $iErrorLevel);
-				if ($iErrorLevel)
+				echo $sCMDDownload."\n";
+				exec($sCMDDownload, $sJunk, $iErrorLevel);
+				while ($iErrorLevel > 0)
 				{
 					echo "Error: $iErrorLevel\n";
-					exit($iErrorLevel);
+					sleep(60);
+					echo 'Re-trying: '.$sCMDDownload."\n";
+					exec($sCMDDownload, $sJunk, $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')."','osm2pgsql')";
+				$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')";
 				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";
+				echo date('Y-m-d H:i:s')." Completed osmosis step for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
+			}
+
+			$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);
+			}
+			$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);
-//			}
+			// Archive for debug?
+			unlink($sImportFile);
 
 			$sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
 
@@ -462,31 +371,6 @@
 			$sThisIndexCmd = $sCMDIndex;
 			$fCMDStartTime = time();
 
-			if (!$aResult['no-npi'])
-			{
-				$iFileID = $oDB->getOne('select nextval(\'file\')');
-				if (PEAR::isError($iFileID))
-				{
-					echo $iFileID->getMessage()."\n";
-					exit(-1);
-				} 
-				$sFileDir = CONST_BasePath.'/export/diff/';
-				$sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
-				$sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
-
-				if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
-				$sThisIndexCmd .= $sFileDir;
-				$sThisIndexCmd .= '/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT);
-				$sThisIndexCmd .= ".npi.out";
-
-				preg_match('#^([0-9]{4})-([0-9]{2})-([0-9]{2})#', $sBatchEnd, $aBatchMatch);
-				$sFileDir = CONST_BasePath.'/export/index/';
-				$sFileDir .= $aBatchMatch[1].'/'.$aBatchMatch[2];
-
-				if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
-				file_put_contents($sFileDir.'/'.$aBatchMatch[3].'.idx', "$sBatchEnd\t$iFileID\n", FILE_APPEND);
-			}
-
 			if (!$aResult['no-index'])
 			{
 				echo "$sThisIndexCmd\n";
@@ -496,25 +380,6 @@
 					echo "Error: $iErrorLevel\n";
 					exit($iErrorLevel);
 				}
-
-				if (!$aResult['no-npi'])
-				{
-					$sFileDir = CONST_BasePath.'/export/diff/';
-					$sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
-					$sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
-
-					$sThisIndexCmd = 'bzip2 -z9 '.$sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out";
-					echo "$sThisIndexCmd\n";
-					exec($sThisIndexCmd, $sJunk, $iErrorLevel);
-					if ($iErrorLevel)
-					{
-						echo "Error: $iErrorLevel\n";
-						exit($iErrorLevel);
-					}
-
-					rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",
-						$sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.bz2");
-				}
 			}
 
 			$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')";
@@ -527,7 +392,7 @@
 
 			$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 )
 			{
@@ -540,56 +405,6 @@
 			echo date('Y-m-d H:i:s')." Sleeping $iSleep seconds\n";
 			sleep($iSleep);
 		}
-
-	}
-
-	if ($aResult['import-npi-all'])
-	{
-		$iNPIID = $oDB->getOne('select max(npiid) from import_npi_log');
-		if (PEAR::isError($iNPIID))
-		{
-			var_dump($iNPIID);
-			exit;
-		}
-		$sConfigDirectory = CONST_BasePath.'/settings';
-		$sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.$sBasePath.'/nominatim/partitionedtags.def -F ';
-		while(true)
-		{
-			$fStartTime = time();
-
-			$iNPIID++;
-
-			$sImportFile = CONST_BasePath.'/export/diff/';
-			$sImportFile .= str_pad(floor($iNPIID/1000000), 3, '0', STR_PAD_LEFT);
-			$sImportFile .= '/'.str_pad(floor($iNPIID/1000) % 1000, 3, '0', STR_PAD_LEFT);
-			$sImportFile .= '/'.str_pad($iNPIID % 1000, 3, '0', STR_PAD_LEFT);
-			$sImportFile .= ".npi";
-			while(!file_exists($sImportFile) && !file_exists($sImportFile.'.bz2'))
-			{
-				echo "sleep (waiting for $sImportFile)\n";
-				sleep(10);
-			}
-			if (file_exists($sImportFile.'.bz2')) $sImportFile .= '.bz2';
-
-			$iFileSize = filesize($sImportFile);
-		
-			// Import the file
-			$fCMDStartTime = time();
-			$sCMDImport = $sCMDImportTemplate . $sImportFile;
-			echo $sCMDImport."\n";
-			exec($sCMDImport, $sJunk, $iErrorLevel);
-			if ($iErrorLevel)
-			{
-				echo "Error: $iErrorLevel\n";
-				exit;
-			}
-			$sBatchEnd = $iNPIID;
-			echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n";
-			$sSQL = "INSERT INTO import_npi_log values ($iNPIID, null, $iFileSize,'".date('Y-m-d H:i:s',$fCMDStartTime)."','".date('Y-m-d H:i:s')."','import')";
-			var_Dump($sSQL);
-			$oDB->query($sSQL);
-		}
-		
 	}
 
 	function getosmosistimestamp($sOsmosisConfigDirectory)