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

huge cleanup of tigerAddressImport.py

Browse Source
This commit is contained in:
marc tobias
2017-10-22 11:28:34 +02:00
committed by Sarah Hoffmann
parent b062e7e774
commit a71200a57a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/imports.php
View File

@@ -34,16 +34,18 @@ if (isset($aCMDResult['parse-tiger'])) {
exec($sUnzipCmd);
$sShapeFilename = $sTempDir.'/'.basename($sImportFile, '.zip').'.shp';
$sSqlFilename = CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql')
$sSqlFilenameTmp = $sTempDir.'/'.$sCountyID.'.sql';
$sSqlFilename = CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql';
if (!file_exists($sShapeFilename)) {
echo "Failed unzip ($sImportFile)\n";
} else {
$sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFilename.' '.$sSqlFilename;
$sParseCmd = CONST_BasePath.'/utils/tigerAddressImport.py '.$sShapeFilename.' '.$sSqlFilenameTmp;
exec($sParseCmd);
if (!file_exists($sOsmFile)) {
if (!file_exists($sSqlFilenameTmp)) {
echo "Failed parse ($sImportFile)\n";
if file_exists($sSqlFilename) unlink($sSqlFilename);
} else {
copy($sSqlFilenameTmp, $sSqlFilename);
}
}
// Cleanup