]> git.openstreetmap.org Git - nominatim.git/commitdiff
fix nominatim paths
authorSarah Hoffmann <lonvia@denofr.de>
Wed, 16 Mar 2016 18:56:10 +0000 (19:56 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Wed, 16 Mar 2016 18:56:10 +0000 (19:56 +0100)
utils/update.php

index 670273028b98990f7c8b3c596f5e2a03741b43d2..d9667ccf021afbd088d524fb6ff15bb61a64dcfa 100755 (executable)
                $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 = $sInstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
+               $sCMDIndex = CONST_InstallPath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$aResult['index-instances'];
                if (!$aResult['no-npi']) {
                        $sCMDIndex .= '-F ';
                }
                        exit(1);
                }
                $sConfigDirectory = CONST_InstallPath.'/settings';
-               $sCMDImportTemplate = $sBasePath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.CONST_BasePath.'/nominatim/partitionedtags.def -F ';
+               $sCMDImportTemplate = CONST_InstallPath.'/nominatim/nominatim -d gazetteer -P 5433 -I -T '.CONST_BasePath.'/settings/partitionedtags.def -F ';
                while(true)
                {
                        $fStartTime = time();