extensions where introduced in postgresql in 9.1, not in 9.0

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index bab94e76fc570314c2728989f57f9c81eb3ede54..b0eecfc8ca3998b3678a5ff7f56cb04f6a4467fd 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -19,6 +19,7 @@
                array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),
                array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),
                array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
                array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),
                array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),
                array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),

+               array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'),

                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partitions', '', 0, 1, 0, 0, 'bool', 'Create required partition tables and triggers'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
                array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
                array('create-partitions', '', 0, 1, 0, 0, 'bool', 'Create required partition tables and triggers'),
                array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),


@@ -29,6 +30,7 @@
                array('osmosis-init-date', '', 0, 1, 1, 1, 'string', 'Generate default osmosis configuration'),
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'),
                array('osmosis-init-date', '', 0, 1, 1, 1, 'string', 'Generate default osmosis configuration'),
                array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
                array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'),

+               array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'),

        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
        );
        getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 


@@ -56,6 +58,8 @@
                        $aCMDResult['osmosis-init-date'] = date('Y-m-d', $iTime).'T22:00:00Z';
                }
        }
                        $aCMDResult['osmosis-init-date'] = date('Y-m-d', $iTime).'T22:00:00Z';
                }
        }

+       $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+       if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;

 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {


@@ -64,9 +68,9 @@
                $oDB =& DB::connect(CONST_Database_DSN, false);
                if (!PEAR::isError($oDB))
                {
                $oDB =& DB::connect(CONST_Database_DSN, false);
                if (!PEAR::isError($oDB))
                {

-                       fail('database already exists');
+                       fail('database already exists ('.CONST_Database_DSN.')');

                }
                }

-               passthru('createdb nominatim');
+               passthru('createdb '.$aDSNInfo['database']);

        }
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])


@@ -76,9 +80,13 @@
                // TODO: path detection, detection memory, etc.
 
                $oDB =& getDB();
                // TODO: path detection, detection memory, etc.
 
                $oDB =& getDB();

-               passthru('createlang plpgsql nominatim');
-               pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/_int.sql');
-               pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+               passthru('createlang plpgsql '.$aDSNInfo['database']);
+        $pgver = (float) CONST_Postgresql_Version;
+               if ($pgver < 9.1) {
+                       pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
+               } else {
+                       pgsqlRunScript('CREATE EXTENSION hstore');
+               }

                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');


@@ -96,8 +104,10 @@
                echo "Import\n";
                $bDidSomething = true;
 
                echo "Import\n";
                $bDidSomething = true;
 

-               if (!file_exists(CONST_BasePath.'/osm2pgsql/osm2pgsql')) fail("please download and build osm2pgsql");
-               passthru(CONST_BasePath.'/osm2pgsql/osm2pgsql -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']);
+               $osm2pgsql = CONST_Osm2pgsql_Binary;
+               if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
+               passthru($osm2pgsql.' -lsc -O gazetteer -C 12000 --hstore -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']);
+        pgsqlRunScript('ANALYSE');

 
                $oDB =& getDB();
                $x = $oDB->getRow('select * from place limit 1');
 
                $oDB =& getDB();
                $x = $oDB->getRow('select * from place limit 1');


@@ -114,6 +124,36 @@
                pgsqlRunScript($sTemplate);
        }
 
                pgsqlRunScript($sTemplate);
        }
 

+       if ($aCMDResult['create-minimal-tables'])
+       {
+               echo "Minimal Tables\n";
+               $bDidSomething = true;
+               pgsqlRunScriptFile(CONST_BasePath.'/sql/tables-minimal.sql');
+
+               $sScript = '';
+
+               // Backstop the import process - easliest possible import id
+               $sScript .= "insert into import_npi_log values (18022);\n";
+
+               $hFile = @fopen(CONST_BasePath.'/settings/partitionedtags.def', "r");
+               if (!$hFile) fail('unable to open list of partitions: '.CONST_BasePath.'/settings/partitionedtags.def');
+
+               while (($sLine = fgets($hFile, 4096)) !== false && $sLine && substr($sLine,0,1) !='#')
+               {
+                       list($sClass, $sType) = explode(' ', trim($sLine));
+                       $sScript .= "create table place_classtype_".$sClass."_".$sType." as ";
+                       $sScript .= "select place_id as place_id,geometry as centroid from placex limit 0;\n";
+
+                       $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_centroid ";
+                       $sScript .= "ON place_classtype_".$sClass."_".$sType." USING GIST (centroid);\n";
+
+                       $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_place_id ";
+                       $sScript .= "ON place_classtype_".$sClass."_".$sType." USING btree(place_id);\n";
+               }
+               fclose($hFile);
+               pgsqlRunScript($sScript);
+       }
+

        if ($aCMDResult['create-tables'] || $aCMDResult['all'])
        {
                echo "Tables\n";
        if ($aCMDResult['create-tables'] || $aCMDResult['all'])
        {
                echo "Tables\n";


@@ -130,13 +170,9 @@
        {
                echo "Partitions\n";
                $bDidSomething = true;
        {
                echo "Partitions\n";
                $bDidSomething = true;

-echo "here";

                $oDB =& getDB();
                $oDB =& getDB();

-echo "there";

                $sSQL = 'select partition from country_name order by country_code';
                $sSQL = 'select partition from country_name order by country_code';

-var_dump($sSQL);

                $aPartitions = $oDB->getCol($sSQL);
                $aPartitions = $oDB->getCol($sSQL);

-var_dump($aPartitions);

                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());
                if (PEAR::isError($aPartitions))
                {
                        fail($aPartitions->getMessage());


@@ -147,11 +183,9 @@ var_dump($aPartitions);
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
                foreach($aMatches as $aMatch)
                {
                preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
                foreach($aMatches as $aMatch)
                {

-var_dump($aMatch);

                        $sResult = '';
                        foreach($aPartitions as $sPartitionName)
                        {
                        $sResult = '';
                        foreach($aPartitions as $sPartitionName)
                        {

-var_dump($sPartitionName);

                                $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
                        }
                        $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);
                                $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]);
                        }
                        $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate);


@@ -294,6 +328,7 @@ var_dump($sPartitionName);
 
        if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])
        {
 
        if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])
        {

+               $bDidSomething = true;

                $oDB =& getDB();
                if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection));
                $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";
                $oDB =& getDB();
                if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection));
                $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) ";


@@ -313,12 +348,14 @@ var_dump($sPartitionName);
        {
                $bDidSomething = true;
 
        {
                $bDidSomething = true;
 

-               if (!file_exists(CONST_BasePath.'/osmosis-0.38/bin/osmosis')) fail("please download osmosis");
+               if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis");

                if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";
                if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";

-               else passthru(CONST_BasePath.'/osmosis-0.38/bin/osmosis --read-replication-interval-init '.CONST_BasePath.'/settings');
+               else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');

 
                $sDate = $aCMDResult['osmosis-init-date'];
 
                $sDate = $aCMDResult['osmosis-init-date'];

-               $sStateFile = file_get_contents('http://toolserver.org/~mazder/replicate-sequences/?'.$sDate);
+               $sURL = 'http://toolserver.org/~mazder/replicate-sequences/?'.$sDate;
+               echo "Getting state file: $sURL\n";
+               $sStateFile = file_get_contents($sURL);

                if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
                file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
        }
                if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
                file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
        }


@@ -328,7 +365,21 @@ var_dump($sPartitionName);
                $bDidSomething = true;
                $sOutputFile = '';
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
                $bDidSomething = true;
                $sOutputFile = '';
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];

-               passthru(CONST_BasePath.'/nominatim/nominatim -i -d nominatim -t '.$iInstances.$sOutputFile);
+               passthru(CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile);
+       }
+
+       if (isset($aCMDResult['create-website']))
+       {
+               $bDidSomething = true;
+               $sTargetDir = $aCMDResult['create-website'];
+               if (!is_dir($sTargetDir)) fail('please specify a directory to setup');
+               @symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php');
+               @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
+               @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
+               @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
+               @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
+               @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
+               echo "Symlinks created\n";

        }
 
        if (!$bDidSomething)
        }
 
        if (!$bDidSomething)


@@ -369,33 +420,22 @@ var_dump($sPartitionName);
        {
                // Convert database DSN to psql paramaters
                $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        {
                // Convert database DSN to psql paramaters
                $aDSNInfo = DB::parseDSN(CONST_Database_DSN);

-               $sCMD = 'psql '.$aDSNInfo['database'];
-
+               if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
+               $sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database'];

                $aDescriptors = array(
                        0 => array('pipe', 'r'),
                $aDescriptors = array(
                        0 => array('pipe', 'r'),

-                       1 => array('pipe', 'w'),
-                       2 => array('file', '/dev/null', 'a')
+                       1 => STDOUT, 
+                       2 => STDERR

                );
                $ahPipes = null;
                );
                $ahPipes = null;

-               $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes);
+               $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes);

                if (!is_resource($hProcess)) fail('unable to start pgsql');
 
                if (!is_resource($hProcess)) fail('unable to start pgsql');
 

-echo "write";
-               fwrite($ahPipes[0], $sScript);
-echo "close";
-               fclose($ahPipes[0]);
-echo "done";
-
-               // TODO: error checking
-               while(!feof($ahPipes[1]))
+               while(strlen($sScript))

                {
                {

-echo "read";
-                       echo fread($ahPipes[1], 4096);
+                       $written = fwrite($ahPipes[0], $sScript);
+                       $sScript = substr($sScript, $written);

                }
                }

-echo "done";
-               fclose($ahPipes[1]);
-
-echo "done1";
+               fclose($ahPipes[0]);

                proc_close($hProcess);
                proc_close($hProcess);

-echo "done2";

        }
        }