From: Sandro Santilli <strk@keybit.net>
Date: Fri, 7 Jan 2005 10:04:16 +0000 (+0000)
Subject: cleanup
X-Git-Tag: pgis_1_0_0RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad5905a9c88cff48467e9d51db01f9d8be2026a2;p=postgis

cleanup


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

diff --git a/lwgeom/lwgeom_dump.c b/lwgeom/lwgeom_dump.c
index ea4588c41..b46eb4182 100644
--- a/lwgeom/lwgeom_dump.c
+++ b/lwgeom/lwgeom_dump.c
@@ -33,6 +33,8 @@ CREATEFUNCTION dump(geometry)
 #include "profile.h"
 #include "wktparse.h"
 
+Datum LWGEOM_dump(PG_FUNCTION_ARGS);
+
 typedef struct GEOMDUMPNODE_T {
 	int idx;
 	LWCOLLECTION *geom;
@@ -78,36 +80,26 @@ Datum LWGEOM_dump(PG_FUNCTION_ARGS)
 			funcctx->multi_call_memory_ctx);
 
 		pglwgeom = (PG_LWGEOM *)PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(0));
-		if ( TYPE_GETTYPE(pglwgeom->type) < MULTIPOINTTYPE )
-		{
-			lwgeom = lwgeom_deserialize(
-				SERIALIZED_FORM(pglwgeom));
-			/*
-			 * Write state the user context
-			 */
-			state = lwalloc(sizeof(GEOMDUMPSTATE));
-			state->stacklen=0;
-			state->root = lwgeom;
-			funcctx->user_fctx = state;
-		}
-		else
-		{
-			lwcoll = lwcollection_deserialize(
-				SERIALIZED_FORM(pglwgeom));
+		lwgeom = lwgeom_deserialize(SERIALIZED_FORM(pglwgeom));
+
+		/* Create function state */
+		state = lwalloc(sizeof(GEOMDUMPSTATE));
+		state->root = lwgeom;
+		state->stacklen=0;
 
+		if ( TYPE_GETTYPE(lwgeom->type) >= MULTIPOINTTYPE )
+		{
 			/*
-			 * Write state the user context
+			 * Push a GEOMDUMPNODE on the state stack
 			 */
 			node = lwalloc(sizeof(GEOMDUMPNODE));
 			node->idx=0;
-			node->geom = lwcoll;
-			state = lwalloc(sizeof(GEOMDUMPSTATE));
-			state->root = (LWGEOM *)lwcoll;
-			state->stacklen=0;
+			node->geom = (LWCOLLECTION *)lwgeom;
 			PUSH(state, node);
-			funcctx->user_fctx = state;
 		}
 
+		funcctx->user_fctx = state;
+
 		/*
 		 * Build a tuple description for an
 		 * geometry_dump tuple
@@ -124,8 +116,8 @@ Datum LWGEOM_dump(PG_FUNCTION_ARGS)
 		funcctx->slot = slot;
 
 		/*
-		 * generate attribute metadata needed later to produce tuples from
-		 * raw C strings
+		 * generate attribute metadata needed later to produce
+		 * tuples from raw C strings
 		 */
 		attinmeta = TupleDescGetAttInMetadata(tupdesc);
 		funcctx->attinmeta = attinmeta;
@@ -144,7 +136,7 @@ Datum LWGEOM_dump(PG_FUNCTION_ARGS)
 	if ( TYPE_GETTYPE(state->root->type) < MULTIPOINTTYPE )
 	{
 		values[0] = "{}";
-		values[1] = lwgeom_to_hexwkb(lwgeom, -1);
+		values[1] = lwgeom_to_hexwkb(state->root, -1);
 		tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);
 		result = TupleGetDatum(funcctx->slot, tuple);
 
@@ -182,7 +174,6 @@ Datum LWGEOM_dump(PG_FUNCTION_ARGS)
 			 * of current node, push a new one on the
 			 * stack
 			 */
-			node->idx;
 			node = lwalloc(sizeof(GEOMDUMPNODE));
 			node->idx=0;
 			node->geom = (LWCOLLECTION *)lwgeom;
@@ -196,9 +187,6 @@ Datum LWGEOM_dump(PG_FUNCTION_ARGS)
 
 	lwgeom->SRID = state->root->SRID;
 
-	//pglwgeom = pglwgeom_serialize(lwgeom);
-	//result = PointerGetDatum(pglwgeom);
-	//lwnotice("%s", address);
 	values[0] = address;
 	values[1] = lwgeom_to_hexwkb(lwgeom, -1);
 	tuple = BuildTupleFromCStrings(funcctx->attinmeta, values);