DB Scheme changes: alter table placex add column calculated_country_code varchar(2);

[nominatim.git] / utils / update.php

diff --git a/utils/update.php b/utils/update.php
index 3c6580dc0b5c1c91b97850424373b378a4de257d..f8bbfb15ee955ed9069d7fad8fdda835fbf1bbf1 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -1,5 +1,6 @@
 #!/usr/bin/php -Cq
 <?php
 #!/usr/bin/php -Cq
 <?php

+

         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
 
         require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
         ini_set('memory_limit', '800M');
 


@@ -14,6 +15,8 @@
 
                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('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-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-npi-all', '', 0, 1, 0, 0, 'bool', 'Import npi pre-indexed files'),
 


@@ -105,7 +108,7 @@
                if (($aResult['import-hourly'] || $aResult['import-daily']) && file_exists($sNextFile))
                {
                        // Import the file
                if (($aResult['import-hourly'] || $aResult['import-daily']) && file_exists($sNextFile))
                {
                        // Import the file

-                       $sCMD = $sBasePath.'/osm2pgsql/osm2pgsql -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' '.$sNextFile;
+                       $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' '.$sNextFile;

                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 
                        echo $sCMD."\n";
                        exec($sCMD, $sJunk, $iErrorLevel);
 


@@ -146,6 +149,8 @@
                // Hack into a modify request
                $sModifyXML = str_replace('<osm version="0.6" generator="OpenStreetMap server">',
                        '<osmChange version="0.6" generator="OpenStreetMap server"><modify>', $sModifyXML);
                // Hack into a modify request
                $sModifyXML = str_replace('<osm version="0.6" generator="OpenStreetMap server">',
                        '<osmChange version="0.6" generator="OpenStreetMap server"><modify>', $sModifyXML);

+               $sModifyXML = str_replace('<osm version=\'0.6\' upload=\'true\' generator=\'JOSM\'>',
+                       '<osmChange version="0.6" generator="OpenStreetMap server"><modify>', $sModifyXML);

                $sModifyXML = str_replace('</osm>', '</modify></osmChange>', $sModifyXML);
 
                // Outputing this is too verbose
                $sModifyXML = str_replace('</osm>', '</modify></osmChange>', $sModifyXML);
 
                // Outputing this is too verbose


@@ -158,7 +163,7 @@
                        2 => array("pipe", "w") // stderr
                );
                $aPipes = array();
                        2 => array("pipe", "w") // stderr
                );
                $aPipes = array();

-               $sCMD = $sBasePath.'/osm2pgsql/osm2pgsql -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' -';
+               $sCMD = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' -';

                echo $sCMD."\n";
                $hProc = proc_open($sCMD, $aSpec, $aPipes);
                if (!is_resource($hProc))
                echo $sCMD."\n";
                $hProc = proc_open($sCMD, $aSpec, $aPipes);
                if (!is_resource($hProc))


@@ -298,13 +303,15 @@
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        {
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';
        if ($aResult['import-osmosis'] || $aResult['import-osmosis-all'])
        {
                $sImportFile = CONST_BasePath.'/data/osmosischange.osc';

-               $sOsmosisCMD = CONST_BasePath.'/osmosis-0.38/bin/osmosis';
+               $sOsmosisCMD = CONST_Osmosis_Binary;

                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $sDatabaseName = 'nominatim';
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;
                $sOsmosisConfigDirectory = CONST_BasePath.'/settings';
                $sDatabaseName = 'nominatim';
                $sCMDDownload = $sOsmosisCMD.' --read-replication-interval workingDirectory='.$sOsmosisConfigDirectory.' --simplify-change --write-xml-change '.$sImportFile;

-               $sCMDImport = $sBasePath.'/osm2pgsql/osm2pgsql -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' '.$sImportFile;
-               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -t 15 -F ';
-//             $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -t 15 ';
+               $sCMDImport = CONST_Osm2pgsql_Binary.' -klas -C 2000 -O gazetteer -d '.$sDatabaseName.' '.$sImportFile;
+               $sCMDIndex = $sBasePath.'/nominatim/nominatim -i -t '.$aResult['index-instances'];
+               if (!$aResult['no-npi']) {
+                       $sCMDIndex .= '-F ';
+               }

                while(true)
                {
                        $fStartTime = time();
                while(true)
                {
                        $fStartTime = time();


@@ -323,10 +330,12 @@
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);
                                        $fCMDStartTime = time();
                                        echo $sCMDDownload."\n";
                                        exec($sCMDDownload, $sJunk, $iErrorLevel);

-                                       if ($iErrorLevel)
+                                       while ($iErrorLevel == 1)

                                        {
                                                echo "Error: $iErrorLevel\n";
                                        {
                                                echo "Error: $iErrorLevel\n";

-                                               exit;
+                                               sleep(60);
+                                               echo 'Re-trying: '.$sCMDDownload."\n";
+                                               exec($sCMDDownload, $sJunk, $iErrorLevel);

                                        }
                                        $iFileSize = filesize($sImportFile);
                                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
                                        }
                                        $iFileSize = filesize($sImportFile);
                                        $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);


@@ -354,15 +363,20 @@
 
                                // Archive for debug?
                                unlink($sImportFile);
 
                                // Archive for debug?
                                unlink($sImportFile);

+//                     }

 
 

-                               $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
+                       $sBatchEnd = getosmosistimestamp($sOsmosisConfigDirectory);
+
+                       // Index file
+                       $sThisIndexCmd = $sCMDIndex;

 
 

-                               // Index file
+                       if (!$aResult['no-npi'])
+                       {

                                $fCMDStartTime = time();
                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))
                                {
                                $fCMDStartTime = time();
                                $iFileID = $oDB->getOne('select nextval(\'file\')');
                                if (PEAR::isError($iFileID))
                                {

-                                       echo $oDB->getMessage()."\n";
+                                       echo $iFileID->getMessage()."\n";

                                        exit;
                                } 
                                $sFileDir = CONST_BasePath.'/export/diff/';
                                        exit;
                                } 
                                $sFileDir = CONST_BasePath.'/export/diff/';


@@ -370,11 +384,9 @@
                                $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
                                $sFileDir .= '/'.str_pad(floor($iFileID/1000) % 1000, 3, '0', STR_PAD_LEFT);
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);

-                               $sThisIndexCmd = $sCMDIndex;

                                $sThisIndexCmd .= $sFileDir;
                                $sThisIndexCmd .= '/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT);
                                $sThisIndexCmd .= ".npi.out";
                                $sThisIndexCmd .= $sFileDir;
                                $sThisIndexCmd .= '/'.str_pad($iFileID % 1000, 3, '0', STR_PAD_LEFT);
                                $sThisIndexCmd .= ".npi.out";

-                               echo "$sThisIndexCmd\n";

 
                                preg_match('#^([0-9]{4})-([0-9]{2})-([0-9]{2})#', $sBatchEnd, $aBatchMatch);
                                $sFileDir = CONST_BasePath.'/export/index/';
 
                                preg_match('#^([0-9]{4})-([0-9]{2})-([0-9]{2})#', $sBatchEnd, $aBatchMatch);
                                $sFileDir = CONST_BasePath.'/export/index/';


@@ -382,7 +394,11 @@
 
                                if (!is_dir($sFileDir)) mkdir($sFileDir, 0777, true);
                                file_put_contents($sFileDir.'/'.$aBatchMatch[3].'.idx', "$sBatchEnd\t$iFileID\n", FILE_APPEND);
 
                                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";

                                exec($sThisIndexCmd, $sJunk, $iErrorLevel);
                                if ($iErrorLevel)
                                {
                                exec($sThisIndexCmd, $sJunk, $iErrorLevel);
                                if ($iErrorLevel)
                                {


@@ -390,39 +406,41 @@
                                        exit;
                                }
 
                                        exit;
                                }
 

-                               $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)
+                               if (!$aResult['no-npi'])

                                {
                                {

-                                       echo "Error: $iErrorLevel\n";
-                                       exit;
-                               }
+                                       $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);

 
 

-                               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");
+                                       $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;
+                                       }

 
 

-                               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')."','index')";
-                               $oDB->query($sSQL);
+                                       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 = "update import_status set lastimportdate = '$sBatchEnd'";
-                               $oDB->query($sSQL);
+                       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')."','index')";
+                       $oDB->query($sSQL);

 
 

+                       $sSQL = "update import_status set lastimportdate = '$sBatchEnd'";
+                       $oDB->query($sSQL);

 
 

-                               $fDuration = time() - $fStartTime;
-                               echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
-                               if (!$aResult['import-osmosis-all']) exit;
-//                     }
+                       $fDuration = time() - $fStartTime;
+                       echo "Completed for $sBatchEnd in ".round($fDuration/60,2)."\n";
+                       if (!$aResult['import-osmosis-all']) exit;

 
                        echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
                        sleep(max(0,60-$fDuration));
                }
 
                        echo "Sleeping ".max(0,60-$fDuration)." seconds\n";
                        sleep(max(0,60-$fDuration));
                }

-               
+

        }
 
        if ($aResult['import-npi-all'])
        }
 
        if ($aResult['import-npi-all'])


@@ -448,7 +466,7 @@
                        $sImportFile .= ".npi";
                        while(!file_exists($sImportFile) && !file_exists($sImportFile.'.bz2'))
                        {
                        $sImportFile .= ".npi";
                        while(!file_exists($sImportFile) && !file_exists($sImportFile.'.bz2'))
                        {

-                               echo "sleep\n";
+                               echo "sleep (waiting for $sImportFile)\n";

                                sleep(10);
                        }
                        if (file_exists($sImportFile.'.bz2')) $sImportFile .= '.bz2';
                                sleep(10);
                        }
                        if (file_exists($sImportFile.'.bz2')) $sImportFile .= '.bz2';