From: Brian Quinion <openstreetmap@brian.quinion.co.uk>
Date: Mon, 3 Sep 2012 13:52:49 +0000 (+0100)
Subject: defered delete should be done even if the place is otherwise blocked
X-Git-Tag: v2.0.0~24
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/1c75adb39fe6f21e4fda3885ded15141edd1f6f8?ds=inline;hp=--cc

defered delete should be done even if the place is otherwise blocked
---

1c75adb39fe6f21e4fda3885ded15141edd1f6f8
diff --git a/sql/functions.sql b/sql/functions.sql
index 20c8c2ab..1227155c 100644
--- a/sql/functions.sql
+++ b/sql/functions.sql
@@ -1234,6 +1234,13 @@ DECLARE
   result BOOLEAN;
 BEGIN
 
+  -- deferred delete
+  IF OLD.indexed_status = 100 THEN
+    --DEBUG: RAISE WARNING 'placex_update_delete % %',NEW.osm_type,NEW.osm_id;
+    delete from placex where place_id = OLD.place_id;
+    RETURN NULL;
+  END IF;
+
   IF NEW.indexed_status != 0 OR OLD.indexed_status = 0 OR NEW.linked_place_id is not null THEN
     RETURN NEW;
   END IF;
@@ -1248,13 +1255,6 @@ BEGIN
     RETURN NEW;
   END IF;
 
-  -- deferred delete
-  IF OLD.indexed_status = 100 THEN
-    --DEBUG: RAISE WARNING 'placex_update_delete % %',NEW.osm_type,NEW.osm_id;
-    delete from placex where place_id = OLD.place_id;
-    RETURN NULL;
-  END IF;
-
   IF OLD.indexed_status != 0 THEN
     --DEBUG: RAISE WARNING 'placex_update_0 % %',NEW.osm_type,NEW.osm_id;