]> git.openstreetmap.org Git - nominatim.git/commitdiff
eliminate php warning, remove setting aPipes (isn't used)
authorDatendelphin <code@osm.datendelphin.net>
Sat, 5 May 2012 08:56:31 +0000 (10:56 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 23 May 2012 21:32:12 +0000 (23:32 +0200)
utils/update.php

index e26a9538859ec8145dd68f0f166797c941fdb757..a3b361b1a14df83669a6bbf9cf807b3a1e5384a4 100755 (executable)
        {
                // derive change from normal osm file with osmosis
                $sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc';
        {
                // derive change from normal osm file with osmosis
                $sTemporaryFile = CONST_BasePath.'/data/osmosischange.osc';
-               if ($aResult['import-file'])
+               if (isset($aResult['import-file']) && $aResult['import-file'])
                {
                        $sCMD = CONST_Osmosis_Binary.' --read-xml \''.$aResult['import-file'].'\' --read-empty --derive-change --write-xml-change '.$sTemporaryFile;
                        echo $sCMD."\n";
                {
                        $sCMD = CONST_Osmosis_Binary.' --read-xml \''.$aResult['import-file'].'\' --read-empty --derive-change --write-xml-change '.$sTemporaryFile;
                        echo $sCMD."\n";
                }
 
                // import generated change file
                }
 
                // import generated change file
-               $aPipes = array();
                $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);
                $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$aDSNInfo['database'].' '.$sTemporaryFile;
                echo $sCMD."\n";
                exec($sCMD, $sJunk, $iErrorLevel);