force UTF-8 database

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 0521b15d98ea391940658b3f9fd7792feeb7080f..af0e1a5e443c9bc4ab692c30094cc426b654af34 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -71,7 +71,7 @@
                {
                        fail('database already exists ('.CONST_Database_DSN.')');
                }
-               passthru('createdb '.$aDSNInfo['database']);
+               passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
        }
 
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
@@ -284,7 +284,7 @@
                        $aDBInstances[$i] =& getDB(true);
                }
 
-               foreach(glob(CONST_BasePath.'/data/tiger2009/*.sql') as $sFile)
+               foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
                {
                        echo $sFile.': ';
                        $hFile = fopen($sFile, "r");
@@ -346,7 +346,7 @@
                if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
        }
 
-       if ($aCMDResult['osmosis-init'] && isset($aCMDResult['osmosis-init-date']))
+       if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date']))
        {
                $bDidSomething = true;