Fix typos (FUNCION), drop duplicate entries

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

diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 58b3f6a642290bd9f750b36e38939b6708a498c2..e683e000d4c5cf10c0d3c55ddc389589d234bef2 100755 (executable)
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -1199,36 +1199,6 @@ DOMAIN topoelement
 DOMAIN topoelementarray
 DOMAIN topogeomelementarray
 FKCONSTRAINT layer_topology_id_fkey
-FUNCION st_addband(raster, integer, text)
-FUNCION st_addband(raster, integer, text, double precision)
-FUNCION st_addband(raster, raster)
-FUNCION st_addband(raster, raster, integer)
-FUNCION st_addband(raster, text)
-FUNCION st_addband(raster, text, double precision)
-FUNCION st_bandisnodata(raster)
-FUNCION st_bandisnodata(raster, integer)
-FUNCION st_bandmetadata(raster)
-FUNCION st_bandnodatavalue(raster)
-FUNCION st_bandpath(raster)
-FUNCION st_bandpixeltype(raster)
-FUNCION st_dumpaspolygons(raster)
-FUNCION st_georeference(raster)
-FUNCION st_hasnoband(raster)
-FUNCION st_makeemptyraster(integer, integer, double precision, double precision, double precision, double precision, double precision, double precision)
-FUNCION st_mapalgebraexpr(raster, integer, text, text, text)
-FUNCION st_mapalgebraexpr(raster, text, text, text)
-FUNCION st_mapalgebra(raster, integer, text)
-FUNCION st_mapalgebra(raster, integer, text, text)
-FUNCION st_mapalgebra(raster, text)
-FUNCION st_mapalgebra(raster, text, text)
-FUNCION st_mapalgebra(raster, text, text, text)
-FUNCION st_polygon(raster)
-FUNCION st_resample(raster, raster, text, double precision)
-FUNCION st_setbandisnodata(raster)
-FUNCION st_setbandnodatavalue(raster, integer, double precision)
-FUNCION st_setgeoreference(raster, text)
-FUNCION st_value(raster, integer, integer)
-FUNCION st_value(raster, integer, integer, integer)
 FUNCTION addauth(text)
 FUNCTION addbbox(geometry)
 FUNCTION addedge(character varying, public.geometry)
@@ -1753,8 +1723,6 @@ FUNCTION postgis_version()
 FUNCTION probe_geometry_columns()
 FUNCTION raster_above(raster, raster)
 FUNCTION raster_below(raster, raster)
-FUNCTION raster_geometry_contain(raster, geometry)
-FUNCTION raster_geometry_overlap(raster, geometry)
 FUNCTION _raster_constraint_info_alignment(name, name, name)
 FUNCTION _raster_constraint_info_blocksize(name, name, name, text)
 FUNCTION _raster_constraint_info_extent(name, name, name)
@@ -1770,6 +1738,8 @@ FUNCTION _raster_constraint_out_db(raster)
 FUNCTION _raster_constraint_pixel_types(raster)
 FUNCTION raster_contained(raster, raster)
 FUNCTION raster_contain(raster, raster)
+FUNCTION raster_geometry_contain(raster, geometry)
+FUNCTION raster_geometry_overlap(raster, geometry)
 FUNCTION raster_in(cstring)
 FUNCTION raster_left(raster, raster)
 FUNCTION raster_out(raster)
@@ -2758,7 +2728,6 @@ OPERATOR &&(geography, geography)
 OPERATOR &&&(geography, geography)
 OPERATOR ~=(geometry, geometry)
 OPERATOR ~(geometry, geometry)
-OPERATOR ~(geometry, raster)
 OPERATOR <<|(geometry, geometry)
 OPERATOR <<(geometry, geometry)
 OPERATOR <=(geometry, geometry)
@@ -2774,10 +2743,12 @@ OPERATOR &<|(geometry, geometry)
 OPERATOR &<(geometry, geometry)
 OPERATOR &>(geometry, geometry)
 OPERATOR &&(geometry, geometry)
-OPERATOR &&(geometry, raster)
 OPERATOR &&&(geometry, geometry)
-OPERATOR ~=(raster, raster)
+OPERATOR ~(geometry, raster)
+OPERATOR &&(geometry, raster)
 OPERATOR ~(raster, geometry)
+OPERATOR &&(raster, geometry)
+OPERATOR ~=(raster, raster)
 OPERATOR ~(raster, raster)
 OPERATOR <<|(raster, raster)
 OPERATOR <<(raster, raster)
@@ -2788,7 +2759,6 @@ OPERATOR @(raster, raster)
 OPERATOR &<|(raster, raster)
 OPERATOR &<(raster, raster)
 OPERATOR &>(raster, raster)
-OPERATOR &&(raster, geometry)
 OPERATOR &&(raster, raster)
 PROCEDURALLANGUAGE plpgsql
 RULE geometry_columns_delete