[postgis-commits] svn - r3381 - trunk/doc/xsl

[postgis-commits at postgis.refractions.net]

Author: robe
Date: 2008-12-11 11:38:50 -0800 (Thu, 11 Dec 2008)
New Revision: 3381

Modified:
   trunk/doc/xsl/postgis_gardentest.sql.xsl
Log:
Fix typo in geometry test

Modified: trunk/doc/xsl/postgis_gardentest.sql.xsl
===================================================================
--- trunk/doc/xsl/postgis_gardentest.sql.xsl	2008-12-11 18:57:57 UTC (rev 3380)
+++ trunk/doc/xsl/postgis_gardentest.sql.xsl	2008-12-11 19:38:50 UTC (rev 3381)
@@ -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 @@
 		<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 @@
 <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 @@
 		<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>