From: Bborie Park <bkpark at ucdavis.edu>
Date: Fri, 18 Nov 2011 21:41:55 +0000 (+0000)
Subject: Update parameter names for regprocedure data types
X-Git-Tag: 2.0.0alpha1~674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4f0215f7e5bf27a079b2598f17dd52a1c642486;p=postgis

Update parameter names for regprocedure data types


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

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in.c
index 258c42dee..a59efc7aa 100644
--- a/raster/rt_pg/rtpostgis.sql.in.c
+++ b/raster/rt_pg/rtpostgis.sql.in.c
@@ -1643,55 +1643,55 @@ CREATE OR REPLACE FUNCTION st_mapalgebraexpr(rast raster, pixeltype text, expres
 
 -- All arguments supplied, use the C implementation.
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, band integer, 
-        pixeltype text, userfunction regprocedure, variadic args text[]) 
+        pixeltype text, onerastuserfunc regprocedure, variadic args text[]) 
     RETURNS raster
     AS 'MODULE_PATHNAME', 'RASTER_mapAlgebraFct'
     LANGUAGE 'C' IMMUTABLE;
 
 -- Variant 1: missing user args
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, band integer,
-        pixeltype text, userfunction regprocedure)
+        pixeltype text, onerastuserfunc regprocedure)
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, $2, $3, $4, NULL) $$
     LANGUAGE SQL;
 
 -- Variant 2: missing pixeltype; default to pixeltype of rast
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, band integer,
-        userfunction regprocedure, variadic args text[])
+        onerastuserfunc regprocedure, variadic args text[])
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, $2, NULL, $3, VARIADIC $4) $$
     LANGUAGE SQL;
  
 -- Variant 3: missing pixeltype and user args; default to pixeltype of rast
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, band integer,
-        userfunction regprocedure)
+        onerastuserfunc regprocedure)
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, $2, NULL, $3, NULL) $$
     LANGUAGE SQL;
 
 -- Variant 4: missing band; default to band 1
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, pixeltype text,
-        userfunction regprocedure, variadic args text[])
+        onerastuserfunc regprocedure, variadic args text[])
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, 1, $2, $3, VARIADIC $4) $$
     LANGUAGE SQL;
 
 -- Variant 5: missing band and user args; default to band 1
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, pixeltype text,
-        userfunction regprocedure)
+        onerastuserfunc regprocedure)
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, 1, $2, $3, NULL) $$
     LANGUAGE SQL;
 
 -- Variant 6: missing band, and pixeltype; default to band 1, pixeltype of rast.
-CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, userfunction regprocedure,
+CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, onerastuserfunc regprocedure,
         variadic args text[])
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, 1, NULL, $2, VARIADIC $3) $$
     LANGUAGE SQL;
 
 -- Variant 7: missing band, pixeltype, and user args; default to band 1, pixeltype of rast.
-CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, userfunction regprocedure)
+CREATE OR REPLACE FUNCTION st_mapalgebrafct(rast raster, onerastuserfunc regprocedure)
     RETURNS raster
     AS $$ SELECT st_mapalgebrafct($1, 1, NULL, $2, NULL) $$
     LANGUAGE SQL;
@@ -1726,7 +1726,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebraexpr(
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(
 	rast1 raster, band1 integer,
 	rast2 raster, band2 integer,
-	userfunction regprocedure,
+	tworastuserfunc regprocedure,
 	pixeltype text DEFAULT NULL, extenttype text DEFAULT 'INTERSECTION',
 	VARIADIC userargs text[] DEFAULT NULL
 )
@@ -1737,7 +1737,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebrafct(
 CREATE OR REPLACE FUNCTION st_mapalgebrafct(
 	rast1 raster,
 	rast2 raster,
-	userfunction regprocedure,
+	tworastuserfunc regprocedure,
 	pixeltype text DEFAULT NULL, extenttype text DEFAULT 'INTERSECTION',
 	VARIADIC userargs text[] DEFAULT NULL
 )
@@ -1754,7 +1754,7 @@ CREATE OR REPLACE FUNCTION st_mapalgebrafctngb(
     pixeltype text,
     ngbwidth integer,
     ngbheight integer,
-    userfunction regprocedure,
+    onerastngbuserfunc regprocedure,
     nodatamode text,
     variadic args text[]
 )