X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/80cf5df1cd5c249a547f877c73fd6feba9b763b0..ccca38f22d25624a420316419a697f893780d6fc:/utils/specialphrases.php?ds=sidebyside

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 28d55010..97b60dde 100755
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -10,7 +10,7 @@
                 array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
                 array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                 array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-                array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for coutry codes and names'),
+                array('countries', '', 0, 1, 0, 0, 'bool', 'Create import script for country codes and names'),
                 array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
         );
         getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
@@ -42,9 +42,9 @@
 			{
 				foreach($aMatches as $aMatch)
 				{
-					$sLabel = $aMatch[1];
-					$sClass = $aMatch[2];
-					$sType = $aMatch[3];
+					$sLabel = trim($aMatch[1]);
+					$sClass = trim($aMatch[2]);
+					$sType = trim($aMatch[3]);
 					# hack around a bug where building=yes was imported with
 					# quotes into the wiki
 					$sType = preg_replace('/"/', '', $sType);
@@ -86,22 +86,26 @@
 
 		foreach($aPairs as $aPair)
 		{
-			if ($aPair[0] == 'yes') continue;
-			if ($aPair[1] == 'yes') continue;
-			if ($aPair[0] == 'highway') continue;
-			if ($aPair[1] == 'highway') continue;
-
-			echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." as ";
-			echo "select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
-			echo "class = '".pg_escape_string($aPair[0])."' and type = '".pg_escape_string($aPair[1])."';\n";
+			echo "create table place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]);
+			if (CONST_Tablespace_Aux_Data)
+				echo " tablespace ".CONST_Tablespace_Aux_Data;
+			echo " as select place_id as place_id,st_centroid(geometry) as centroid from placex where ";
+			echo "class = '".pg_escape_string($aPair[0])."' and type = '".pg_escape_string($aPair[1])."'";
+			echo ";\n";
 
 			echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_centroid ";
-			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING GIST (centroid);\n";
+			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING GIST (centroid)";
+			if (CONST_Tablespace_Aux_Index)
+				echo " tablespace ".CONST_Tablespace_Aux_Index;
+			echo ";\n";
 
 			echo "CREATE INDEX idx_place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])."_place_id ";
-			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING btree(place_id);\n";
+			echo "ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." USING btree(place_id)";
+			if (CONST_Tablespace_Aux_Index)
+				echo " tablespace ".CONST_Tablespace_Aux_Index;
+			echo ";\n";
 
-            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1])." TO \"www-data\";";
+            echo "GRANT SELECT ON place_classtype_".pg_escape_string($aPair[0])."_".pg_escape_string($aPair[1]).' TO "'.CONST_Database_Web_User."\";\n";
 
 		}