More changes - can't remember

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 18a5315038d105e6fb919fafa3b88295a72aebbb..ca959e0a9bf74cd413b3b140bbfabe76a6d99dbf 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -11,6 +11,8 @@
        <xsl:output method="text" />\r
        <!--Exclude this from testing - it crashes or already tested in special section -->\r
        <xsl:variable name='fnexclude'>ST_CurveToLine AddGeometryColumn DropGeometryColumn DropGeometryTable</xsl:variable>\r
+       <!--This is just a place holder to state functions not supported in 1.3 branch -->\r
+       <xsl:variable name='fnexclude13'>Populate_Geometry_Columns ST_IsValidReason</xsl:variable>      \r
        <xsl:variable name='var_srid'>4269</xsl:variable>\r
        <xsl:variable name='var_integer'>5</xsl:variable>\r
        <xsl:variable name='var_float1'>0.5</xsl:variable>\r
@@ -112,14 +114,14 @@ SELECT 'create,insert,drop Test: Start Testing Multi/<xsl:value-of select="@Geom
 <!-- For each function prototype generate a test sql statement -->\r
 <xsl:choose>\r
 <!--Test functions that take no arguments -->\r
-       <xsl:when test="count(paramdef/parameter) = 0">SELECT  'Starting <xsl:value-of select="funcdef/function" />()';BEGIN; \r
+       <xsl:when test="count(paramdef/parameter) = 0 and not(contains($fnexclude,@id))">SELECT  'Starting <xsl:value-of select="funcdef/function" />()';BEGIN; \r
 SELECT  <xsl:value-of select="funcdef/function" />();\r
 COMMIT;\r
 SELECT  'Ending <xsl:value-of select="funcdef/function" />()';\r
        </xsl:when>\r
 <!--Start Test aggregate and unary functions -->\r
 <!--Garden Aggregator/Unary function with input gsets test -->\r
-       <xsl:when test="(contains(paramdef/type,'geometry set') or (count(paramdef/parameter) = 1 and (contains(paramdef/type, 'geometry') or contains(paramdef/type, 'box')))) and not(contains($fnexclude,funcdef/function))" >\r
+       <xsl:when test="(contains(paramdef[1]/type,'geometry set') or (count(paramdef/parameter) = 1 and contains(paramdef[1]/type, 'geometry')) and not(contains($fnexclude,@id)))" >\r
                <xsl:variable name='fnname'><xsl:value-of select="funcdef/function"/></xsl:variable>\r
                <xsl:variable name='fndef'><xsl:value-of select="funcdef"/></xsl:variable>\r
                <xsl:for-each select="document('')//pgis:gardens/pgis:gset">\r
@@ -233,7 +235,7 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text> <xsl:value-of se
                                        <xsl:when test="contains(type, 'bytea')"> \r
                                                <xsl:text>ST_AsBinary(foo1.the_geom)</xsl:text>\r
                                        </xsl:when>\r
-                                       <xsl:when test="contains(type, 'float')"> \r
+                                       <xsl:when test="contains(type, 'float') or contains(type, 'double')"> \r
                                                <xsl:value-of select="$var_float1" />\r
                                        </xsl:when>\r
                                        <xsl:when test="contains(type, 'spheroid')"> \r