Fix wrong SQL prototype, wrong PostGIS version number, and use NULL as default value...

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

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index 31c5b48131122cb80dac83474c0820d1f86c4d81..2f09edbb1ecd1a92541325be8fe5e7b66f4fab32 100644 (file)
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -365,6 +365,7 @@ st_asgeojson
 
          <refsynopsisdiv>
                <funcsynopsis>
+<!--
                        <funcprototype>
                                <funcdef>text <function>ST_AsGML</function></funcdef>
                                <paramdef><type>geometry </type> <parameter>geom</parameter></paramdef>
@@ -377,6 +378,7 @@ st_asgeojson
                                <paramdef choice='opt'><type>integer </type> <parameter>maxdecimaldigits=15</parameter></paramdef>
                                <paramdef choice='opt'><type>integer </type> <parameter>options=0</parameter></paramdef>
                        </funcprototype>
+-->
 
                        <funcprototype>
                                <funcdef>text <function>ST_AsGML</function></funcdef>
@@ -448,7 +450,7 @@ namespace prefix or no prefix (if empty). If null or omitted 'gml' prefix is use
                  <para>Availability: 1.5.0 geography support was introduced.</para>
                  <para>Enhanced: 2.0.0 prefix support was introduced. Option 4 for GML3 was introduced to allow using LineString instead of Curve tag for lines. GML3 Support for Polyhedral surfaces and TINS was introduced. Option 32 was introduced to output the box.</para>
                  <para>Changed: 2.0.0 use default named args</para>
-                 <para>Availability: 2.0.1 id support was introduced, for GML 3.</para>
+                 <para>Availability: 2.1.0 id support was introduced, for GML 3.</para>
                 
                <note><para>Only version 3+ of ST_AsGML supports Polyhedral Surfaces and TINS.</para></note>
                <para>&Z_support;</para>

diff --git a/postgis/geography_inout.c b/postgis/geography_inout.c
index c0d9ff2a1d960418ef2fbba1cb5ce7682fd8a8a9..f8cb5811f1b1ce8d779b4726c085ff3dede95a4c 100644 (file)
--- a/postgis/geography_inout.c
+++ b/postgis/geography_inout.c
@@ -214,7 +214,7 @@ Datum geography_as_gml(PG_FUNCTION_ARGS)
        const char *prefix = default_prefix;
        char *prefix_buf = "";
        text *prefix_text, *id_text = NULL;
-       const char *id="";
+       const char *id=NULL;
        char *id_buf;
 
 

diff --git a/postgis/lwgeom_export.c b/postgis/lwgeom_export.c
index 0624030cbc9609734280234965a19932d8ddbd3b..e0a551e982c121d4cc909e913797e01fad29b4d7 100644 (file)
--- a/postgis/lwgeom_export.c
+++ b/postgis/lwgeom_export.c
@@ -174,7 +174,7 @@ Datum LWGEOM_asGML(PG_FUNCTION_ARGS)
        int precision = OUT_MAX_DOUBLE_PRECISION;
        static const char* default_prefix = "gml:"; /* default prefix */
        const char* prefix = default_prefix;
-       const char* gml_id = "";
+       const char* gml_id = NULL;
        char *prefix_buf, *gml_id_buf;
        text *prefix_text, *gml_id_text;
 

diff --git a/postgis/postgis.sql.in.c b/postgis/postgis.sql.in.c
index b36708db8378251f4ec42893960c67c120a388d3..7c397a87cc0610af6a0bf3fbd68186e003b09bd8 100644 (file)
--- a/postgis/postgis.sql.in.c
+++ b/postgis/postgis.sql.in.c
@@ -3427,7 +3427,7 @@ CREATE OR REPLACE FUNCTION _ST_AsGML(int4, geometry, int4, int4, text, text)
 -- ST_AsGML (geom, precision, option) / version=2
 -- Availability: 1.4.0
 -- Changed: 2.0.0 to have default args
-CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT)
+CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0)
        RETURNS TEXT
        AS $$ SELECT _ST_AsGML(2, $1, $2, $3, null, null); $$
        LANGUAGE 'sql' IMMUTABLE STRICT;
@@ -3438,7 +3438,7 @@ CREATE OR REPLACE FUNCTION ST_AsGML(geom geometry, maxdecimaldigits int4 DEFAULT
 -- Availability: 2.0.0
 -- Changed: 2.0.0 to use default and named args
 -- ST_AsGML(version, geom, precision, option, prefix, id)
--- Availability: 2.0.1
+-- Availability: 2.1.0
 CREATE OR REPLACE FUNCTION ST_AsGML(version int4, geom geometry, maxdecimaldigits int4 DEFAULT 15, options int4 DEFAULT 0, nprefix text DEFAULT null, id text DEFAULT null)
        RETURNS TEXT
        AS $$ SELECT _ST_AsGML($1, $2, $3, $4, $5, $6); $$