more corrections

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 92317f4a2c3eae48f0fa526c570a8a75a30497d4..7d30dfc5e47513ec3a7cf97627a5e95396126ff5 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -329,7 +329,6 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                </xsl:for-each>\r
        </xsl:template>\r
 \r
-       <!--macro to replace func args with dummy var args -->\r
        <!--macro to replace func args with dummy var args -->\r
        <xsl:template name="replaceparams">\r
                <xsl:param name="func" />\r

diff --git a/doc/xsl/postgis_gardentest_subset.sql.xsl b/doc/xsl/postgis_gardentest_subset.sql.xsl
index a49de7b4c07eb4cb9478f8fe3bd3bf8b6a7f2411..cee33ddc87900c61ebdfe599e80ea528dfa04519 100644 (file)
--- a/doc/xsl/postgis_gardentest_subset.sql.xsl
+++ b/doc/xsl/postgis_gardentest_subset.sql.xsl
@@ -236,7 +236,7 @@ SELECT '<xsl:value-of select="$fnname" /> <xsl:text> </xsl:text><xsl:value-of se
                          </xsl:when>\r
                          <xsl:otherwise>\r
                                SELECT 'Other <xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of select="@ID" />(<xsl:value-of select="$fnargs" />): Start Testing <xsl:value-of select="$geom1type" />, <xsl:value-of select="@GeometryType" />';\r
-       BEGIN; <!-- If output is geography show wkt rep -->\r
+       BEGIN; \r
        SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)\r
                          </xsl:otherwise>\r
                        </xsl:choose>\r
@@ -256,7 +256,6 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                </xsl:for-each>\r
        </xsl:template>\r
 \r
-       <!--macro to replace func args with dummy var args -->\r
        <!--macro to replace func args with dummy var args -->\r
        <xsl:template name="replaceparams">\r
                <xsl:param name="func" />\r
@@ -284,9 +283,15 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <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="(type = 'geography' or type = 'geography ' or contains(type,'geography set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geography')]) )">\r
+                                               <xsl:text>geography(foo1.the_geom)</xsl:text>\r
+                                       </xsl:when>\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="type = 'geography' or type = 'geography '">\r
+                                               <xsl:text>geography(foo2.the_geom)</xsl:text>\r
+                                       </xsl:when>\r
                                        <xsl:when test="contains(type, 'geometry[]') and count($func/paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'WKT') or contains(text(), 'bytea')]) = '1'">\r
                                                ARRAY[foo1.the_geom]\r
                                        </xsl:when>\r