Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib-sql / functions / placex_triggers.sql

diff --git a/lib-sql/functions/placex_triggers.sql b/lib-sql/functions/placex_triggers.sql
index 086ba9300f8145d317b7e915894aa4c514f9864d..6998224e7b851893e590d9f63ca47ca6acd1b18e 100644 (file)
--- a/lib-sql/functions/placex_triggers.sql
+++ b/lib-sql/functions/placex_triggers.sql
@@ -666,20 +666,17 @@ BEGIN
   NEW.housenumber := NULL;
   IF NEW.address is not NULL THEN
       IF NEW.address ? 'conscriptionnumber' THEN
   NEW.housenumber := NULL;
   IF NEW.address is not NULL THEN
       IF NEW.address ? 'conscriptionnumber' THEN

-        i := getorcreate_housenumber_id(make_standard_name(NEW.address->'conscriptionnumber'));

         IF NEW.address ? 'streetnumber' THEN
         IF NEW.address ? 'streetnumber' THEN

-            i := getorcreate_housenumber_id(make_standard_name(NEW.address->'streetnumber'));

             NEW.housenumber := (NEW.address->'conscriptionnumber') || '/' || (NEW.address->'streetnumber');
         ELSE
             NEW.housenumber := NEW.address->'conscriptionnumber';
         END IF;
       ELSEIF NEW.address ? 'streetnumber' THEN
         NEW.housenumber := NEW.address->'streetnumber';
             NEW.housenumber := (NEW.address->'conscriptionnumber') || '/' || (NEW.address->'streetnumber');
         ELSE
             NEW.housenumber := NEW.address->'conscriptionnumber';
         END IF;
       ELSEIF NEW.address ? 'streetnumber' THEN
         NEW.housenumber := NEW.address->'streetnumber';

-        i := getorcreate_housenumber_id(make_standard_name(NEW.address->'streetnumber'));

       ELSEIF NEW.address ? 'housenumber' THEN
         NEW.housenumber := NEW.address->'housenumber';
       ELSEIF NEW.address ? 'housenumber' THEN
         NEW.housenumber := NEW.address->'housenumber';

-        i := getorcreate_housenumber_id(make_standard_name(NEW.housenumber));

       END IF;
       END IF;

+      NEW.housenumber := create_housenumber_id(NEW.housenumber);

 
       addr_street := NEW.address->'street';
       addr_place := NEW.address->'place';
 
       addr_street := NEW.address->'street';
       addr_place := NEW.address->'place';