Fix the DEBUGF statements I didn't realise I broke with the new LWGEOM parser/unparse...

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

diff --git a/lwgeom/lwgeom_geos_c.c b/lwgeom/lwgeom_geos_c.c
index 7eba96646edd6d3ef11c5a86f76c10de2ce8c873..2e79dd62601686c8a111bcf7015fe8e94cad230a 100644 (file)
--- a/lwgeom/lwgeom_geos_c.c
+++ b/lwgeom/lwgeom_geos_c.c
@@ -3162,15 +3162,20 @@ Datum GEOSnoop(PG_FUNCTION_ARGS)
 {
        PG_LWGEOM *geom;
        GEOSGeom geosgeom;
-       PG_LWGEOM *result;
+       PG_LWGEOM *lwgeom_result;
+#if POSTGIS_DEBUG_LEVEL > 0
+       int result; 
+       LWGEOM_UNPARSER_RESULT lwg_unparser_result;
+#endif
 
        initGEOS(lwnotice, lwnotice);
 
        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));
-       */
+#if POSTGIS_DEBUG_LEVEL > 0
+       result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, SERIALIZED_FORM(geom), PARSER_CHECK_NONE);
+       POSTGIS_DEBUGF(2, "GEOSnoop: IN: %s", lwg_unparser_result.wkoutput);
+#endif
 
        geosgeom = POSTGIS2GEOS(geom);
        if ( ! geosgeom ) PG_RETURN_NULL();
@@ -3180,16 +3185,17 @@ Datum GEOSnoop(PG_FUNCTION_ARGS)
        profstop(PROF_GRUN);
 #endif
 
-       result = GEOS2POSTGIS(geosgeom, TYPE_HASZ(geom->type));
+       lwgeom_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));
-       */
+#if POSTGIS_DEBUG_LEVEL > 0
+       result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, SERIALIZED_FORM(lwgeom_result), PARSER_CHECK_NONE);
+       POSTGIS_DEBUGF(4, "GEOSnoop: OUT: %s", lwg_unparser_result.wkoutput);
+#endif
        
        PG_FREE_IF_COPY(geom, 0);
 
-       PG_RETURN_POINTER(result);
+       PG_RETURN_POINTER(lwgeom_result);
 }
 
 PG_FUNCTION_INFO_V1(polygonize_garray);

diff --git a/lwgeom/lwgeom_gist.c b/lwgeom/lwgeom_gist.c
index 005c798c8f54417c71a2646c979763880a7a8bca..530f12ce5e6f29c452826ed6e441e8df19cd9938 100644 (file)
--- a/lwgeom/lwgeom_gist.c
+++ b/lwgeom/lwgeom_gist.c
@@ -450,6 +450,10 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS)
 
        PG_LWGEOM *in; /* lwgeom serialized */
        BOX2DFLOAT4 *rr;
+#if POSTGIS_DEBUG_LEVEL > 0
+       int result;
+       LWGEOM_UNPARSER_RESULT lwg_unparser_result;
+#endif
 
        POSTGIS_DEBUG(2, "GIST: LWGEOM_gist_compress called");
 
@@ -465,10 +469,11 @@ Datum LWGEOM_gist_compress(PG_FUNCTION_ARGS)
                        /* 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 POSTGIS_DEBUG_LEVEL > 0
+                       result = serialized_lwgeom_to_ewkt(&lwg_unparser_result, (uchar *)in+VARHDRSZ, PARSER_CHECK_NONE);
+                       POSTGIS_DEBUGF(4, "GIST: LWGEOM_gist_compress detoasted entry->key: %s", lwg_unparser_result.wkoutput);
+#endif         
+       
                        if (in == NULL)
                        {
                                elog(ERROR, "PG_DETOAST_DATUM(<notnull>) returned NULL ??");

diff --git a/lwgeom/lwgeom_inout.c b/lwgeom/lwgeom_inout.c
index d4ef4affa72070c992f5bbc18cb752a52bddb7cb..1d3fc858ce914d8282b91a14f6ba871f0787ad85 100644 (file)
--- a/lwgeom/lwgeom_inout.c
+++ b/lwgeom/lwgeom_inout.c
@@ -514,7 +514,11 @@ Datum LWGEOM_recv(PG_FUNCTION_ARGS)
 {
        StringInfo buf = (StringInfo) PG_GETARG_POINTER(0);
         bytea *wkb;
-       PG_LWGEOM *result;
+       PG_LWGEOM *lwgeom_result;
+#if POSTGIS_DEBUG_LEVEL > 0
+       int result;
+       LWGEOM_UNPARSER_RESULT lwg_unparser_result;
+#endif
 
        POSTGIS_DEBUG(2, "LWGEOM_recv start");
 
@@ -526,19 +530,22 @@ Datum LWGEOM_recv(PG_FUNCTION_ARGS)
        POSTGIS_DEBUG(3, "LWGEOM_recv calling LWGEOMFromWKB");
 
        /* Call LWGEOM_from_bytea function... */
-       result = (PG_LWGEOM *)DatumGetPointer(DirectFunctionCall1(
+       lwgeom_result = (PG_LWGEOM *)DatumGetPointer(DirectFunctionCall1(
                LWGEOMFromWKB, PointerGetDatum(wkb)));
 
        POSTGIS_DEBUG(3, "LWGEOM_recv advancing StringInfo buffer");
 
-       POSTGIS_DEBUGF(3, "LWGEOM_from_bytea returned %s", serialized_lwgeom_to_hexwkb(SERIALIZED_FORM(result), PARSER_CHECK_NONE, -1, NULL));
+#if POSTGIS_DEBUG_LEVEL > 0
+       result = serialized_lwgeom_to_hexwkb(&lwg_unparser_result, SERIALIZED_FORM(lwgeom_result), PARSER_CHECK_NONE, -1);
+       POSTGIS_DEBUGF(3, "LWGEOM_from_bytea returned %s", lwg_unparser_result.wkoutput);
+#endif
 
        /* Set cursor to the end of buffer (so the backend is happy) */
        buf->cursor = buf->len;
 
        POSTGIS_DEBUG(3, "LWGEOM_recv returning");
 
-        PG_RETURN_POINTER(result);
+        PG_RETURN_POINTER(lwgeom_result);
 }
 
 PG_FUNCTION_INFO_V1(LWGEOM_send);