X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/33f7bba69858405517c68a4aaf609ce69e00e277..f1c4615c32532cdb03845c017f660fa5c5a06331:/utils/update.php

diff --git a/utils/update.php b/utils/update.php
index ccf69300..a561aaa3 100755
--- a/utils/update.php
+++ b/utils/update.php
@@ -253,6 +253,13 @@
 
 	if ($aResult['deduplicate'])
 	{
+
+		$pgver = (float) CONST_Postgresql_Version;
+                if ($pgver < 9.3) {
+			echo "ERROR: deduplicate is only currently supported in postgresql 9.3";
+			exit;
+		}
+
                 $oDB =& getDB();
                 $sSQL = 'select partition from country_name order by country_code';
                 $aPartitions = $oDB->getCol($sSQL);
@@ -275,15 +282,15 @@
 				var_dump($aTokenSet, $sSQL);
 				exit;
 			}
-			
+
 			$aKeep = array_shift($aTokenSet);
 			$iKeepID = $aKeep['word_id'];
 
 			foreach($aTokenSet as $aRemove)
 			{
 				$sSQL = "update search_name set";
-				$sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.",";
-				$sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+				$sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID."),";
+				$sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")";
 				$sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
 				$x = $oDB->query($sSQL);
 				if (PEAR::isError($x))
@@ -293,7 +300,7 @@
 				}
 
 				$sSQL = "update search_name set";
-				$sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+				$sSQL .= " nameaddress_vector = array_replace(nameaddress_vector,".$aRemove['word_id'].",".$iKeepID.")";
 				$sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]";
 				$x = $oDB->query($sSQL);
 				if (PEAR::isError($x))
@@ -303,7 +310,7 @@
 				}
 
 				$sSQL = "update location_area_country set";
-				$sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID;
+				$sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")";
 				$sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
 				$x = $oDB->query($sSQL);
 				if (PEAR::isError($x))
@@ -315,8 +322,7 @@
 				foreach ($aPartitions as $sPartition)
 				{
 					$sSQL = "update search_name_".$sPartition." set";
-					$sSQL .= " name_vector = (name_vector - ".$aRemove['word_id'].")+".$iKeepID.",";
-					$sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
+					$sSQL .= " name_vector = array_replace(name_vector,".$aRemove['word_id'].",".$iKeepID.")";
 					$sSQL .= " where name_vector @> ARRAY[".$aRemove['word_id']."]";
 					$x = $oDB->query($sSQL);
 					if (PEAR::isError($x))
@@ -325,18 +331,8 @@
 						exit;
 					}
 
-					$sSQL = "update search_name_".$sPartition." set";
-					$sSQL .= " nameaddress_vector = (nameaddress_vector - ".$aRemove['word_id'].")+".$iKeepID;
-					$sSQL .= " where nameaddress_vector @> ARRAY[".$aRemove['word_id']."]";
-					$x = $oDB->query($sSQL);
-					if (PEAR::isError($x))
-					{
-						var_dump($x);
-						exit;
-					}
-
 					$sSQL = "update location_area_country set";
-					$sSQL .= " keywords = (keywords - ".$aRemove['word_id'].")+".$iKeepID;
+					$sSQL .= " keywords = array_replace(keywords,".$aRemove['word_id'].",".$iKeepID.")";
 					$sSQL .= " where keywords @> ARRAY[".$aRemove['word_id']."]";
 					$x = $oDB->query($sSQL);
 					if (PEAR::isError($x))