more cleanup. Get rid of more deprecated functions, put in more stable,imuutable...

git-svn-id: http://svn.osgeo.org/postgis/trunk@7112 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extras/tiger_geocoder/tiger_2010/geocode/reverse_geocode.sql b/extras/tiger_geocoder/tiger_2010/geocode/reverse_geocode.sql
index eb97e25e73172903d4cacebe37ec8a023b784de2..1b0638c19a9b8724430eb9f43f3e85af6affd980 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/geocode/reverse_geocode.sql
+++ b/extras/tiger_geocoder/tiger_2010/geocode/reverse_geocode.sql
@@ -98,4 +98,4 @@ $$
 -- default to not include street range in cross streets
     SELECT reverse_geocode($1,false);
 $$
-language sql STABLE;
\ No newline at end of file
+language sql STABLE COST 1000;
\ No newline at end of file

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/end_soundex.sql b/extras/tiger_geocoder/tiger_2010/normalize/end_soundex.sql
index 02500ddb14e3a9d63e229623fb70dd6a59d937ee..834b6ed1a5f3bc257e999b9707eaa832c8a9af88 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/end_soundex.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/end_soundex.sql
@@ -14,4 +14,4 @@ BEGIN
   END IF;
   return tempString;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql IMMUTABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/get_last_words.sql b/extras/tiger_geocoder/tiger_2010/normalize/get_last_words.sql
index 54058a288d3461c2ca90a1c4c00367d45b3845d5..7e9cfd3de7b69cc10362992c8a3bfb0e2e751b40 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/get_last_words.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/get_last_words.sql
@@ -26,4 +26,4 @@ BEGIN
 
   RETURN result;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql IMMUTABLE COST 10;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/location_extract.sql b/extras/tiger_geocoder/tiger_2010/normalize/location_extract.sql
index e901660382d0399d4a2f956b7c8265e0bed052cf..b855303a835b3eaeba6b69d424e11065d4192f14 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/location_extract.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/location_extract.sql
@@ -82,4 +82,4 @@ BEGIN
 
   RETURN location;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql STABLE COST 100;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_countysub_exact.sql b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_countysub_exact.sql
index f2303a3444acf5f293d84780b50d812c6a16572b..a73d3d6fb9e08e206c7cf2c61de4fd1a0edfd204 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_countysub_exact.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_countysub_exact.sql
@@ -53,4 +53,4 @@ BEGIN
 
   RETURN location;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql STABLE COST 10;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_exact.sql b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_exact.sql
index 3f5a1fd98c3fa68531827a731c73666e47d604a0..62fc7da06e8b0dd326638030bd7325de9b8a7e79 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_exact.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_exact.sql
@@ -56,4 +56,4 @@ BEGIN
 
   RETURN location;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql STABLE COST 100;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_fuzzy.sql b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_fuzzy.sql
index 899558aced5bad8e0cd17e98ca9f1356ebaf5bc6..30451b0da4612dd52ff139b2c547ee0571cdcd35 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_fuzzy.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/location_extract_place_fuzzy.sql
@@ -85,4 +85,4 @@ BEGIN
 
   RETURN location;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql STABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql b/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
index beb216fd6fd2e70fa3c4c7b50476ac1fafe98b23..b09605e6a4e870cbf324bee3d7bbf94338c9e305 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/pprint_addy.sql
@@ -33,4 +33,4 @@ BEGIN
   RETURN trim(result);
 
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql IMMUTABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/normalize/state_extract.sql b/extras/tiger_geocoder/tiger_2010/normalize/state_extract.sql
index 193df2bd312ca5cc633f58c4ad37aa63ffefe253..a599f9f6a4b9994e2eb58030e1346685c31b0442 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/normalize/state_extract.sql
+++ b/extras/tiger_geocoder/tiger_2010/normalize/state_extract.sql
@@ -86,4 +86,4 @@ BEGIN
 
   RETURN result;
 END;
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql STABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/utility/cull_null.sql b/extras/tiger_geocoder/tiger_2010/utility/cull_null.sql
index dd11ced6b184a0d55fb06dce358d6ecfc195e68a..4c9c89a013035566535bd61fe9c6873a81466365 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/utility/cull_null.sql
+++ b/extras/tiger_geocoder/tiger_2010/utility/cull_null.sql
@@ -2,7 +2,5 @@
 -- This is used to concatinate values that may be null.
 CREATE OR REPLACE FUNCTION cull_null(VARCHAR) RETURNS VARCHAR
 AS $_$
-BEGIN
-    RETURN coalesce($1,'');
-END;
-$_$ LANGUAGE plpgsql;
+    SELECT coalesce($1,'');
+$_$ LANGUAGE sql IMMUTABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/utility/levenshtein_ignore_case.sql b/extras/tiger_geocoder/tiger_2010/utility/levenshtein_ignore_case.sql
index 7e1fa9fa2f6254816834402d75d82e8e45df4e29..6447ae604f72e8e098a68e1a85885c6556967072 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/utility/levenshtein_ignore_case.sql
+++ b/extras/tiger_geocoder/tiger_2010/utility/levenshtein_ignore_case.sql
@@ -1,10 +1,5 @@
 -- This function determines the levenshtein distance irespective of case.
 CREATE OR REPLACE FUNCTION levenshtein_ignore_case(VARCHAR, VARCHAR) RETURNS INTEGER
 AS $_$
-DECLARE
-  result INTEGER;
-BEGIN
-  result := levenshtein(upper($1), upper($2));
-  RETURN result;
-END
-$_$ LANGUAGE plpgsql;
+  SELECT levenshtein(upper($1), upper($2));
+$_$ LANGUAGE sql IMMUTABLE;

diff --git a/extras/tiger_geocoder/tiger_2010/utility/nullable_levenshtein.sql b/extras/tiger_geocoder/tiger_2010/utility/nullable_levenshtein.sql
index 69be7377b33c4e5b048590a6ad11ec07683cb0ee..8bc205b67593e9611c3818988ae46b7eed5d7ffa 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/utility/nullable_levenshtein.sql
+++ b/extras/tiger_geocoder/tiger_2010/utility/nullable_levenshtein.sql
@@ -25,4 +25,4 @@ BEGIN
 
   RETURN result;
 END
-$_$ LANGUAGE plpgsql;
+$_$ LANGUAGE plpgsql IMMUTABLE COST 10;

diff --git a/extras/tiger_geocoder/tiger_2010/utility/utmzone.sql b/extras/tiger_geocoder/tiger_2010/utility/utmzone.sql
index 485e0b7ce1e6bd310aa03ff1753ad974bca92828..5afdfc4100c5de6ea371e9bae112c1592af10420 100644 (file)
--- a/extras/tiger_geocoder/tiger_2010/utility/utmzone.sql
+++ b/extras/tiger_geocoder/tiger_2010/utility/utmzone.sql
@@ -5,13 +5,13 @@ DECLARE
     zone int;
     pref int;
 BEGIN
-    geomgeog:=transform($1,4326);
-    IF (y(geomgeog))>0 THEN
+    geomgeog:=ST_Transform($1,4326);
+    IF (ST_Y(geomgeog))>0 THEN
         pref:=32600;
     ELSE
         pref:=32700;
     END IF;
-    zone:=floor((x(geomgeog)+180)/6)+1;
+    zone:=floor((ST_X(geomgeog)+180)/6)+1;
     RETURN zone+pref;
 END;
 $BODY$ LANGUAGE 'plpgsql' immutable;