osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-09-11 19:17:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

make import-osmosis(-all) fail with error code!=0

Browse Source
This commit is contained in:
Sarah Hoffmann 2013-09-25 23:05:47 +02:00
parent 528de055d1
commit bf182ba2dc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/update.php
View File

@ -446,7 +446,7 @@
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error: $iErrorLevel\n"; echo "Error: $iErrorLevel\n";
exit; exit($iErrorLevel);
} }
echo "Completed for $sBatchEnd in ".round((time()-$fCMDStartTime)/60,2)." minutes\n"; echo "Completed 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')"; $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')";
@ -469,7 +469,7 @@
if (PEAR::isError($iFileID)) if (PEAR::isError($iFileID))
{ {
echo $iFileID->getMessage()."\n"; echo $iFileID->getMessage()."\n";
exit; exit(-1);
} }
$sFileDir = CONST_BasePath.'/export/diff/'; $sFileDir = CONST_BasePath.'/export/diff/';
$sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT); $sFileDir .= str_pad(floor($iFileID/1000000), 3, '0', STR_PAD_LEFT);
@ -495,7 +495,7 @@
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error: $iErrorLevel\n"; echo "Error: $iErrorLevel\n";
exit; exit($iErrorLevel);
} }
if (!$aResult['no-npi']) if (!$aResult['no-npi'])
@ -510,7 +510,7 @@
if ($iErrorLevel) if ($iErrorLevel)
{ {
echo "Error: $iErrorLevel\n"; echo "Error: $iErrorLevel\n";
exit; exit($iErrorLevel);
} }
rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2", rename($sFileDir.'/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT).".npi.out.bz2",