bulk ip watch

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 70652fbc9b07a2d66a5c558a118c41d3d1033b7c..d402b5543ec86d0095a805b67a0bb32dff6acda5 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -109,6 +109,7 @@
                $pgver = (float) CONST_Postgresql_Version;
                if ($pgver < 9.1) {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
                $pgver = (float) CONST_Postgresql_Version;
                if ($pgver < 9.1) {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');

+                       pgsqlRunScriptFile(CONST_BasePath.'/sql/hstore_compatability_9_0.sql');

                } else {
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
                } else {
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }


@@ -511,7 +512,6 @@
                pg_query($oDB->connection, 'TRUNCATE import_status');
                $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
                pg_query($oDB->connection, $sSQL);
                pg_query($oDB->connection, 'TRUNCATE import_status');
                $sSQL = "INSERT INTO import_status VALUES('".$aRepMatch[2]."')";
                pg_query($oDB->connection, $sSQL);

-               exit;

        }
 
        if ($aCMDResult['index'] || $aCMDResult['all'])
        }
 
        if ($aCMDResult['index'] || $aCMDResult['all'])


@@ -569,8 +569,11 @@
                @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/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/deletable.php', $sTargetDir.'/deletable.php');
+               @symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');

                @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');
                @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images');
                @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js');

+               @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css');

                echo "Symlinks created\n";
        }
 
                echo "Symlinks created\n";
        }