From: Regina Obe <lr@pcorp.us>
Date: Thu, 11 Dec 2008 19:38:50 +0000 (+0000)
Subject: Fix typo in geometry test
X-Git-Tag: 1.4.0b1~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ad7cef7cb8ef5588980c0c3dccf4dfc800238c0;p=postgis

Fix typo in geometry test

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index dcefc7ab4..11d1b4a34 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -18,13 +18,13 @@
 			<xsl:for-each select="refsynopsisdiv/funcsynopsis/funcprototype">
 <xsl:if test="count(paramdef/parameter) = 0">SELECT  <xsl:value-of select="funcdef/function" />();
 </xsl:if>
-<!--Start Test aggregate functions 
+<!--Start Test aggregate and unary functions 
  TODO: Make this section less verbose -->
 <!--Point Aggregate/geom accessor test -->
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">
 <!-- If output is geometry show ewkt rep -->
 	<xsl:choose>
-	  <xsl:when test="contains(funcdef/function, 'geometry')">
+	  <xsl:when test="contains(funcdef, 'geometry ')">
 		SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 	ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))
 	  </xsl:when>
@@ -33,14 +33,14 @@
 		<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))
 	  </xsl:otherwise>
 	</xsl:choose>
-	FROM (SELECT ST_Point(i,j) As the_geom 
+	FROM (SELECT ST_SetSRID(ST_Point(i,j),4326) As the_geom 
 		FROM generate_series(-60,50,5) As i 
 			CROSS JOIN generate_series(40,70, 5) j) As foo;  
 </xsl:if>
 <!--Multi/Line Aggregate/accessor test -->
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">
 	<xsl:choose>
-	  <xsl:when test="contains(funcdef/function, 'geometry')">
+	  <xsl:when test="contains(funcdef, 'geometry ')">
 SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 	ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))
 	  </xsl:when>
@@ -49,7 +49,7 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 		<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))
 	  </xsl:otherwise>
 	</xsl:choose>
-	FROM (SELECT ST_MakeLine(ST_Point(i,j),ST_Point(j,i))  As the_geom 
+	FROM (SELECT ST_MakeLine(ST_SetSRID(ST_Point(i,j),4326),ST_SetSRID(ST_Point(j,i),4326))  As the_geom 
 		FROM generate_series(-60,50,5) As i 
 			CROSS JOIN generate_series(40,70, 5) j) As foo;  
 </xsl:if>
@@ -57,7 +57,7 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 <xsl:if test="contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef/type, 'geometry'))">
 <!-- If output is geometry show ewkt rep -->
 	<xsl:choose>
-	  <xsl:when test="contains(funcdef/function, 'geometry')">
+	  <xsl:when test="contains(funcdef, 'geometry ')">
 		SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 	ST_AsEWKT(<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom)))
 	  </xsl:when>
@@ -66,11 +66,11 @@ SELECT ST_AsEWKT(<xsl:value-of select="funcdef/function" />(the_geom)),
 		<xsl:value-of select="funcdef/function" />(ST_Multi(the_geom))
 	  </xsl:otherwise>
 	</xsl:choose>
-	FROM (SELECT ST_Buffer(ST_Point(i,j), j)  As the_geom 
+	FROM (SELECT ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)  As the_geom 
 		FROM generate_series(-60,50,5) As i 
 			CROSS JOIN generate_series(40,70, 5) j) As foo;  
 </xsl:if>
-<!--End Test aggregate functions -->
+<!--End Test aggregate and unary functions -->
 			</xsl:for-each>
 		</xsl:for-each>
 	</xsl:template>