safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Ported functions for the import of special phrases from php to python.

Browse Source 
- the command is now --import-special-phrases
- the output is not an sql file anymore, data are directly imported to the database.
- the little part on the documentation (section data import) has been modified.
This commit is contained in:
AntoJvlt
2021-03-20 18:55:08 +01:00
parent 0d9fe6e49c
commit 17cb59efbd
13 changed files with 445 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib-sql/functions/normalization.sql
View File

@@ -118,7 +118,7 @@ $$
LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION getorcreate_amenity(lookup_word TEXT, normalized_word TEXT,
CREATE OR REPLACE FUNCTION getorcreate_amenity(lookup_word TEXT,
lookup_class text, lookup_type text)
RETURNS INTEGER
AS $$
@@ -128,12 +128,12 @@ DECLARE
BEGIN
lookup_token := ' '||trim(lookup_word);
SELECT min(word_id) FROM word
WHERE word_token = lookup_token and word = normalized_word
WHERE word_token = lookup_token and word = lookup_word
and class = lookup_class and type = lookup_type
INTO return_word_id;
IF return_word_id IS NULL THEN
return_word_id := nextval('seq_word');
INSERT INTO word VALUES (return_word_id, lookup_token, normalized_word,
INSERT INTO word VALUES (return_word_id, lookup_token, lookup_word,
lookup_class, lookup_type, null, 0);
END IF;
RETURN return_word_id;
@@ -143,7 +143,6 @@ LANGUAGE plpgsql;
CREATE OR REPLACE FUNCTION getorcreate_amenityoperator(lookup_word TEXT,
normalized_word TEXT,
lookup_class text,
lookup_type text,
op text)
@@ -155,12 +154,12 @@ DECLARE
BEGIN
lookup_token := ' '||trim(lookup_word);
SELECT min(word_id) FROM word
WHERE word_token = lookup_token and word = normalized_word
WHERE word_token = lookup_token and word = lookup_word
and class = lookup_class and type = lookup_type and operator = op
INTO return_word_id;
IF return_word_id IS NULL THEN
return_word_id := nextval('seq_word');
INSERT INTO word VALUES (return_word_id, lookup_token, normalized_word,
INSERT INTO word VALUES (return_word_id, lookup_token, lookup_word,
lookup_class, lookup_type, null, 0, op);
END IF;
RETURN return_word_id;