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

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2008-10-03 10:37:42 -0700 (Fri, 03 Oct 2008)
New Revision: 3061

Modified:
   trunk/lwgeom/lwgeom_geos_c.c
   trunk/lwgeom/lwgeom_gist.c
   trunk/lwgeom/lwgeom_inout.c
Log:
Patch up and comment out some DEBUGF lines that don't compile due to changes in function 
signatures in liblwgeom


Modified: trunk/lwgeom/lwgeom_geos_c.c
===================================================================
--- trunk/lwgeom/lwgeom_geos_c.c	2008-10-03 13:23:56 UTC (rev 3060)
+++ trunk/lwgeom/lwgeom_geos_c.c	2008-10-03 17:37:42 UTC (rev 3061)
@@ -3168,7 +3168,9 @@
 
 	geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
 
+	/* TODO: serialized_lwgeom_to_ewkt doesn't return string, this needs fixing
 	POSTGIS_DEBUGF(2, "GEOSnoop: IN: %s", serialized_lwgeom_to_ewkt(SERIALIZED_FORM(geom), PARSER_CHECK_NONE));
+	*/
 
 	geosgeom = POSTGIS2GEOS(geom);
 	if ( ! geosgeom ) PG_RETURN_NULL();
@@ -3181,8 +3183,10 @@
 	result = GEOS2POSTGIS(geosgeom, TYPE_HASZ(geom->type));
 	GEOSGeom_destroy(geosgeom);
 
+	/* TODO: serialized_lwgeom_to_ewkt doesn't return string, this needs fixing
 	POSTGIS_DEBUGF(4, "GEOSnoop: OUT: %s", serialized_lwgeom_to_ewkt(SERIALIZED_FORM(result), PARSER_CHECK_NONE));
-
+	*/
+	
 	PG_FREE_IF_COPY(geom, 0);
 
 	PG_RETURN_POINTER(result);
@@ -3636,7 +3640,7 @@
 	if (!pghe)
 		elog(ERROR, "PreparedCacheDelete: Trying to delete non-existant hash entry object with MemoryContext key (%p)", (void *)context);
 
-	LWDEBUGF(3, "deleting geom object (%p) and prepared geom object (%p) with MemoryContext key (%p)", pghe.geom, pghe.prepared_geom, context);
+	LWDEBUGF(3, "deleting geom object (%p) and prepared geom object (%p) with MemoryContext key (%p)", pghe->geom, pghe->prepared_geom, context);
 
 	/* Free them */
 	if( pghe->prepared_geom )

Modified: trunk/lwgeom/lwgeom_gist.c
===================================================================
--- trunk/lwgeom/lwgeom_gist.c	2008-10-03 13:23:56 UTC (rev 3060)
+++ trunk/lwgeom/lwgeom_gist.c	2008-10-03 17:37:42 UTC (rev 3061)
@@ -465,8 +465,10 @@
 			/* lwgeom serialized form */
 			in = (PG_LWGEOM*)PG_DETOAST_DATUM(entry->key);
 
+			/* TODO, fix this, serialized_lwgeom_to_wkt doesn't return string anymore, returns status
 			POSTGIS_DEBUGF(4, "GIST: LWGEOM_gist_compress detoasted entry->key: %s", serialized_lwgeom_to_ewkt((uchar *)in+VARHDRSZ, PARSER_CHECK_NONE));
-
+			*/
+			
 			if (in == NULL)
 			{
 				elog(ERROR, "PG_DETOAST_DATUM(<notnull>) returned NULL ??");

Modified: trunk/lwgeom/lwgeom_inout.c
===================================================================
--- trunk/lwgeom/lwgeom_inout.c	2008-10-03 13:23:56 UTC (rev 3060)
+++ trunk/lwgeom/lwgeom_inout.c	2008-10-03 17:37:42 UTC (rev 3061)
@@ -313,7 +313,7 @@
 #endif
 
 	LWDEBUGF(3, "Output size is %lu (comp: %lu)",
-		VARSIZE(lwgeom_result), (unsigned long)size);
+		VARSIZE(lwgeom_result), (unsigned long)size_result);
 
 	PG_RETURN_POINTER(lwgeom_result);
 }