Finish fix for ticket #1635. Added operator function to skip when restoring.

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

diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in
index 39a4078c2adca3616d3d160e751c7a8d57412b32..58b3f6a642290bd9f750b36e38939b6708a498c2 100755 (executable)
--- a/utils/postgis_restore.pl.in
+++ b/utils/postgis_restore.pl.in
@@ -1539,6 +1539,8 @@ FUNCTION geometry_overlaps(geometry, geometry)
 FUNCTION geometry_overlaps_nd(geometry, geometry)
 FUNCTION geometry_overleft(geometry, geometry)
 FUNCTION geometry_overright(geometry, geometry)
+FUNCTION geometry_raster_contain(geometry, raster)
+FUNCTION geometry_raster_overlap(geometry, raster)
 FUNCTION geometry_recv(internal)
 FUNCTION geometry_right(geometry, geometry)
 FUNCTION geometry_samebox(geometry, geometry)
@@ -1751,6 +1753,8 @@ 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)
@@ -2754,6 +2758,7 @@ OPERATOR &&(geography, geography)
 OPERATOR &&&(geography, geography)
 OPERATOR ~=(geometry, geometry)
 OPERATOR ~(geometry, geometry)
+OPERATOR ~(geometry, raster)
 OPERATOR <<|(geometry, geometry)
 OPERATOR <<(geometry, geometry)
 OPERATOR <=(geometry, geometry)
@@ -2769,8 +2774,10 @@ OPERATOR &<|(geometry, geometry)
 OPERATOR &<(geometry, geometry)
 OPERATOR &>(geometry, geometry)
 OPERATOR &&(geometry, geometry)
+OPERATOR &&(geometry, raster)
 OPERATOR &&&(geometry, geometry)
 OPERATOR ~=(raster, raster)
+OPERATOR ~(raster, geometry)
 OPERATOR ~(raster, raster)
 OPERATOR <<|(raster, raster)
 OPERATOR <<(raster, raster)
@@ -2781,6 +2788,7 @@ OPERATOR @(raster, raster)
 OPERATOR &<|(raster, raster)
 OPERATOR &<(raster, raster)
 OPERATOR &>(raster, raster)
+OPERATOR &&(raster, geometry)
 OPERATOR &&(raster, raster)
 PROCEDURALLANGUAGE plpgsql
 RULE geometry_columns_delete