more errors in my logic

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

diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 7d30dfc5e47513ec3a7cf97627a5e95396126ff5..cbd431cd51af89e69ef16c941f2773e70ea38f13 100644 (file)
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -20,6 +20,7 @@
        <xsl:variable name='var_integer2'>5</xsl:variable>\r
        <xsl:variable name='var_float1'>0.5</xsl:variable>\r
        <xsl:variable name='var_float2'>0.75</xsl:variable>\r
+       <xsl:variable name='var_distance'>100</xsl:variable>\r
        <xsl:variable name='var_version1'>1</xsl:variable>\r
        <xsl:variable name='var_version2'>2</xsl:variable>\r
        <xsl:variable name='var_NDRXDR'>XDR</xsl:variable>\r
@@ -289,7 +290,6 @@ SELECT  'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select=
 \r
 <!--Functions more than 1 args not already covered this will cross every geometry type with every other -->\r
        <xsl:when test="not(contains($fnexclude,funcdef/function))">\r
-               SELECT '<xsl:value-of select="$fnargs" />'\r
                <xsl:for-each select="document('')//pgis:gardens/pgis:gset">\r
        <!--Store first garden sql geometry from -->\r
                        <xsl:variable name="from1"><xsl:value-of select="." /></xsl:variable>\r
@@ -299,17 +299,17 @@ SELECT '<xsl:value-of select="$fnname" /> <xsl:text> </xsl:text><xsl:value-of se
                        <xsl:choose>\r
                          <xsl:when test="$numparamgeogs > '0'">\r
                                SELECT 'Geography <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
-       SELECT ST_AsText(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)), ST_AsText(foo1.the_geom) As ref1_geom, ST_AsText(foo2.the_geom) As ref2_geom\r
+       BEGIN; <!-- If input is geography show wkt rep -->\r
+       SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsText(foo1.the_geom) As ref1_geom, ST_AsText(foo2.the_geom) As ref2_geom\r
                          </xsl:when>\r
                          <xsl:when test="$numparamgeoms > '0'">\r
                                SELECT 'Geometry <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 geometry show ewkt rep -->\r
-       SELECT ST_AsEWKT(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)), ST_AsEWKT(foo1.the_geom) As ref1_geom, ST_AsEWKT(foo2.the_geom) As ref2_geom\r
+       BEGIN; <!-- If input is geometry show ewkt rep -->\r
+       SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsEWKT(foo1.the_geom) As ref1_geom, ST_AsEWKT(foo2.the_geom) As ref2_geom\r
                          </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; <!-- If input is geography show wkt rep -->\r
        SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)\r
                          </xsl:otherwise>\r
                        </xsl:choose>\r
@@ -338,6 +338,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <xsl:when test="contains(parameter, 'matrix') or contains(parameter, 'Matrix')">\r
                                                <xsl:value-of select="$var_matrix" />\r
                                        </xsl:when>\r
+                                       <xsl:when test="contains(parameter, 'distance')">\r
+                                               <xsl:value-of select="$var_distance" />\r
+                                       </xsl:when>\r
                                        <xsl:when test="contains(parameter, 'srid')">\r
                                                <xsl:value-of select="$var_srid" />\r
                                        </xsl:when>\r
@@ -356,7 +359,7 @@ 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:when test="(type = 'geography' or type = 'geography ' or contains(type,'geography set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geography')]) = '1' )">\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

diff --git a/doc/xsl/postgis_gardentest_subset.sql.xsl b/doc/xsl/postgis_gardentest_subset.sql.xsl
index cee33ddc87900c61ebdfe599e80ea528dfa04519..b0a58fa9bc2fcbf10e8446f6d4c32a51f2f3eee7 100644 (file)
--- a/doc/xsl/postgis_gardentest_subset.sql.xsl
+++ b/doc/xsl/postgis_gardentest_subset.sql.xsl
@@ -10,9 +10,8 @@
                        test more geometries but only against one function.  Useful for intro of new functions or comparing major changes from function of one version of PostGIS to the other\r
         ******************************************************************** -->\r
        <xsl:output method="text" />\r
-<xsl:variable name='testversion'>1.5.0</xsl:variable>\r
+       <xsl:variable name='testversion'>1.5.0</xsl:variable>\r
        <xsl:variable name='fninclude'>ST_Distance ST_DWithin ST_AsBinary</xsl:variable>\r
-       <!--This is just a place holder to state functions not supported in 1.3 or tested separately -->\r
 \r
        <xsl:variable name='var_srid'>3395</xsl:variable>\r
        <xsl:variable name='var_position'>1</xsl:variable>\r
@@ -20,6 +19,7 @@
        <xsl:variable name='var_integer2'>5</xsl:variable>\r
        <xsl:variable name='var_float1'>0.5</xsl:variable>\r
        <xsl:variable name='var_float2'>0.75</xsl:variable>\r
+       <xsl:variable name='var_distance'>100</xsl:variable>\r
        <xsl:variable name='var_version1'>1</xsl:variable>\r
        <xsl:variable name='var_version2'>2</xsl:variable>\r
        <xsl:variable name='var_NDRXDR'>XDR</xsl:variable>\r
@@ -159,7 +159,6 @@
        </pgis:gardencrashers>\r
 \r
        <xsl:template match='/chapter'>\r
-\r
 <!-- Start regular function checks excluding operators -->\r
                <xsl:for-each select="sect1[not(contains(@id,'Operator'))]/refentry">\r
                <xsl:sort select="@id"/>\r
@@ -171,9 +170,8 @@
                                <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:variable name='numparams'><xsl:value-of select="count(paramdef/parameter)" /></xsl:variable>\r
-                               <xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'box') or contains(text(), 'bytea')]) + count(paramdef/parameter[contains(text(),'WKT')])" /></xsl:variable>\r
+                               <xsl:variable name='numparamgeoms'><xsl:value-of select="count(paramdef/type[contains(text(),'geometry') or contains(text(),'geography') or contains(text(),'box') or contains(text(), 'bytea')]) + count(paramdef/parameter[contains(text(),'WKT')])" /></xsl:variable>\r
                                <xsl:variable name='numparamgeogs'><xsl:value-of select="count(paramdef/type[contains(text(),'geography')] )" /></xsl:variable>\r
-\r
                                <!-- For each function prototype generate a test sql statement -->\r
                                <xsl:choose>\r
 <!--Test functions that take no arguments or take no geometries -->\r
@@ -216,7 +214,6 @@ SELECT  'Ending <xsl:value-of select="funcdef/function" />(<xsl:value-of select=
 \r
 <!--Functions more than 1 args not already covered this will cross every geometry type with every other -->\r
        <xsl:when test="contains($fninclude,funcdef/function)">\r
-       SELECT '<xsl:value-of select="$fnargs" />'\r
                <xsl:for-each select="document('')//pgis:gardens/pgis:gset">\r
        <!--Store first garden sql geometry from -->\r
                        <xsl:variable name="from1"><xsl:value-of select="." /></xsl:variable>\r
@@ -227,16 +224,16 @@ SELECT '<xsl:value-of select="$fnname" /> <xsl:text> </xsl:text><xsl:value-of se
                          <xsl:when test="$numparamgeogs > '0'">\r
                                SELECT 'Geography <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
-       SELECT ST_AsText(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)), ST_AsText(foo1.the_geom) As ref1_geom, ST_AsText(foo2.the_geom) As ref2_geom\r
+       SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsText(foo1.the_geom) As ref1_geom, ST_AsText(foo2.the_geom) As ref2_geom\r
                          </xsl:when>\r
                          <xsl:when test="$numparamgeoms > '0'">\r
                                SELECT 'Geometry <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 geometry show ewkt rep -->\r
-       SELECT ST_AsEWKT(<xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)), ST_AsEWKT(foo1.the_geom) As ref1_geom, ST_AsEWKT(foo2.the_geom) As ref2_geom\r
+       SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />), ST_AsEWKT(foo1.the_geom) As ref1_geom, ST_AsEWKT(foo2.the_geom) As ref2_geom\r
                          </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; \r
+       BEGIN; <!-- If output is geography show wkt rep -->\r
        SELECT <xsl:value-of select="$fnname" />(<xsl:value-of select="$fnfakeparams" />)\r
                          </xsl:otherwise>\r
                        </xsl:choose>\r
@@ -265,6 +262,9 @@ SELECT '<xsl:value-of select="$fnname" /><xsl:text> </xsl:text><xsl:value-of sel
                                        <xsl:when test="contains(parameter, 'matrix') or contains(parameter, 'Matrix')">\r
                                                <xsl:value-of select="$var_matrix" />\r
                                        </xsl:when>\r
+                                       <xsl:when test="contains(parameter, 'distance')">\r
+                                               <xsl:value-of select="$var_distance" />\r
+                                       </xsl:when>\r
                                        <xsl:when test="contains(parameter, 'srid')">\r
                                                <xsl:value-of select="$var_srid" />\r
                                        </xsl:when>\r
@@ -283,7 +283,7 @@ 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:when test="(type = 'geography' or type = 'geography ' or contains(type,'geography set')) and (position() = 1 or count($func/paramdef/type[contains(text(),'geography')]) = '1' )">\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