[postgis-commits] svn - r3020 - trunk/lwgeom

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2008-09-26 14:46:23 -0700 (Fri, 26 Sep 2008)
New Revision: 3020

Modified:
   trunk/lwgeom/lwgeom_geos_c.c
   trunk/lwgeom/lwpostgis.sql.in.c
Log:
harmonize sql functions with c functions for prepared geometry


Modified: trunk/lwgeom/lwgeom_geos_c.c
===================================================================
--- trunk/lwgeom/lwgeom_geos_c.c	2008-09-26 21:34:31 UTC (rev 3019)
+++ trunk/lwgeom/lwgeom_geos_c.c	2008-09-26 21:46:23 UTC (rev 3020)
@@ -3597,12 +3597,11 @@
 	BOX2DFLOAT4 			box1, box2;
 	PREPARED_GEOM_CACHE *	prep_cache;
 	MemoryContext 			old_context;
-	int32					key1, key2;
+	int32					key1;
 
 	geom1 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	key1 = PG_GETARG_INT32(1);
-	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	key2 = PG_GETARG_INT32(3);
+	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
+	key1 = PG_GETARG_INT32(2);
 	
 	errorIfGeometryCollection(geom1,geom2);
 	errorIfSRIDMismatch(pglwgeom_getSRID(geom1), pglwgeom_getSRID(geom2));
@@ -3671,13 +3670,12 @@
 	BOX2DFLOAT4 			box1, box2;
 	PREPARED_GEOM_CACHE *	prep_cache;
 	MemoryContext 			old_context;
-	int32					key1, key2;
+	int32					key1;
 
 	geom1 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	key1 = PG_GETARG_INT32(1);
-	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
-	key2 = PG_GETARG_INT32(3);
-	
+	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
+	key1 = PG_GETARG_INT32(2);
+
 	errorIfGeometryCollection(geom1,geom2);
 	errorIfSRIDMismatch(pglwgeom_getSRID(geom1), pglwgeom_getSRID(geom2));
 
@@ -3749,8 +3747,8 @@
 	int32					key1, key2;
 
 	geom1 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
-	key1 = PG_GETARG_INT32(1);
-	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(2));
+	geom2 = (PG_LWGEOM *)  PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
+	key1 = PG_GETARG_INT32(2);
 	key2 = PG_GETARG_INT32(3);
 	
 	errorIfGeometryCollection(geom1,geom2);

Modified: trunk/lwgeom/lwpostgis.sql.in.c
===================================================================
--- trunk/lwgeom/lwpostgis.sql.in.c	2008-09-26 21:34:31 UTC (rev 3019)
+++ trunk/lwgeom/lwpostgis.sql.in.c	2008-09-26 21:46:23 UTC (rev 3020)
@@ -4026,16 +4026,16 @@
     LANGUAGE 'SQL' _IMMUTABLE; -- WITH (iscachable);
 
 -- Availability: 1.4.0
-CREATEFUNCTION _ST_IntersectsPrepared(geometry,geometry,integer)
+CREATEFUNCTION _ST_IntersectsPrepared(geometry,geometry,integer,integer)
     RETURNS boolean
     AS 'MODULE_PATHNAME','intersectsPrepared'
     LANGUAGE 'C' _IMMUTABLE_STRICT; -- WITH (isstrict,iscachable);
  	
 -- Availability: 1.4.0
 -- Inlines index magic
-CREATEFUNCTION ST_Intersects(geometry,geometry,integer)
+CREATEFUNCTION ST_Intersects(geometry,geometry,integer,integer)
     RETURNS boolean
-    AS 'SELECT $1 && $2 AND _ST_IntersectsPrepared($1,$2,$3)'
+    AS 'SELECT $1 && $2 AND _ST_IntersectsPrepared($1,$2,$3,$4)'
     LANGUAGE 'SQL' _IMMUTABLE; -- WITH (iscachable);
 
 #endif