Mercurial > gemma

changeset 3736:4cc3b28fd87b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore erased gauges in search.
author Sascha Wilde <wilde@intevation.de>
date Mon, 24 Jun 2019 11:51:31 +0200
parents 96230eadf96e
children e3f15a163823
files schema/search_functions.sql
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/schema/search_functions.sql	Mon Jun 24 11:49:08 2019 +0200
+++ b/schema/search_functions.sql	Mon Jun 24 11:51:31 2019 +0200
@@ -72,7 +72,7 @@
 END;
 $$;
 
-CREATE OR REPLACE FUNCTION search_gauges(search_string text) RETURNS jsonb
+qCREATE OR REPLACE FUNCTION search_gauges(search_string text) RETURNS jsonb
   LANGUAGE plpgsql STABLE PARALLEL SAFE
   AS $$
 DECLARE
@@ -86,7 +86,7 @@
                    ST_AsGeoJSON(geom)::json AS geom,
                    'gauge' AS type
               FROM waterway.gauges
-              WHERE location = isrs_fromText(search_string)
+              WHERE NOT erased AND location = isrs_fromText(search_string)
             ORDER BY name) r;
   ELSE
     SELECT COALESCE(json_agg(r),'[]')
@@ -96,7 +96,7 @@
                    ST_AsGeoJSON(geom)::json AS geom,
                    'gauge' AS type
               FROM waterway.gauges
-              WHERE objname ILIKE '%' || search_string || '%'
+              WHERE NOT erased AND objname ILIKE '%' || search_string || '%'
             ORDER BY name) r;
   END IF;
   RETURN _result;