More conditional corrections. Also take circular back out of test since still crashe...

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 516862a9815415510c35527552976be7aed32e45..b675aa9f52021af9cf17a2d5a7c8e76c01fb8142 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -119,7 +119,7 @@ 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 or take no geometries -->\r
-       <xsl:when test="$numparamgeoms = '0'">SELECT  'Starting <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)';BEGIN; \r
+       <xsl:when test="$numparamgeoms = '0' and not(contains($fnexclude,funcdef/function))">SELECT  'Starting <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)';BEGIN; \r
 SELECT  <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnfakeparams" />);\r
 COMMIT;\r
 SELECT  'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select="$fnargs" />)';\r
@@ -225,16 +225,10 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <xsl:when test="contains(parameter, 'version')"> \r
                                                <xsl:value-of select="$var_version" />\r
                                        </xsl:when>\r
-                                       <xsl:when test="contains(type,'box') and position() = 1"> \r
+                                       <xsl:when test="(contains(type,'box') or type = 'geometry' or type = 'geometry ' or contains(type,'geometry set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1')"> \r
                                                <xsl:text>foo1.the_geom</xsl:text>\r
                                        </xsl:when>\r
-                                       <xsl:when test="contains(type,'box')"> \r
-                                               <xsl:text>foo2.the_geom</xsl:text>\r
-                                       </xsl:when>\r
-                                       <xsl:when test="(type = 'geometry' or type = 'geometry ' or contains(type,'geometry set')) and position() = 1"> \r
-                                               <xsl:text>foo1.the_geom</xsl:text>\r
-                                       </xsl:when>\r
-                                       <xsl:when test="type = 'geometry' or type = 'geometry '"> \r
+                                       <xsl:when test="contains(type,'box') or type = 'geometry' or type = 'geometry '"> \r
                                                <xsl:text>foo2.the_geom</xsl:text>\r
                                        </xsl:when>\r
                                        <xsl:when test="contains(type, 'geometry[]')"> \r