correction to last edit

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 2e0d2dd32595b3679ea30fdd0c35e23e4f495aff..00c705042dac876f8f1ba2df3bb5248100971fb3 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -124,7 +124,7 @@ SELECT  'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select=
        </xsl:when>\r
 <!--Start Test aggregate and unary functions -->\r
 <!--Garden Aggregator/Unary function with input gsets test -->\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:when test="count(paramdef[position() > -1]/type[contains(text(), 'geometry')]) = 0 and not(contains($fnexclude,@id))" >\r
                <xsl:for-each select="document('')//pgis:gardens/pgis:gset">\r
        SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />: Start Testing Multi/<xsl:value-of select="@GeometryType" />'; \r
        BEGIN; <!-- If output is geometry show ewkt rep -->\r
@@ -206,7 +206,7 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <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 ') and position() = 1"> \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