[mapserver-commits] r8557 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-02-16 07:52:16 -0500 (Mon, 16 Feb 2009)
New Revision: 8557

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwms.c
Log:
move xlink declaration to root of WMS 1.3.0 DescribeLayerResponse


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-02-16 05:35:30 UTC (rev 8556)
+++ trunk/mapserver/HISTORY.TXT	2009-02-16 12:52:16 UTC (rev 8557)
@@ -12,6 +12,8 @@
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
 
+- move xlink declaration to root of WMS 1.3.0 DescribeLayerResponse
+
 - Fixed a scalebar rounding problem causing to draw zero scalebar width (#2890)
 
 - SLD: if it conatins a Filer Encoding tag, try to always set the

Modified: trunk/mapserver/mapwms.c
===================================================================
--- trunk/mapserver/mapwms.c	2009-02-16 05:35:30 UTC (rev 8556)
+++ trunk/mapserver/mapwms.c	2009-02-16 12:52:16 UTC (rev 8557)
@@ -2892,7 +2892,7 @@
    }
    else
    {
-       msIO_printf("<DescribeLayerResponse xmlns=\"http://www.opengis.net/sld\" xmlns:ows=\"http://www.opengis.net/ows\" xmlns:se=\"http://www.opengis.net/se\" xmlns:wfs=\"http://www.opengis.net/wfs\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"  xsi:schemaLocation=\"http://www.opengis.net/sld %s/sld/1.1.0/DescribeLayer.xsd\">\n", schemalocation);
+       msIO_printf("<DescribeLayerResponse xmlns=\"http://www.opengis.net/sld\" xmlns:ows=\"http://www.opengis.net/ows\" xmlns:se=\"http://www.opengis.net/se\" xmlns:wfs=\"http://www.opengis.net/wfs\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xsi:schemaLocation=\"http://www.opengis.net/sld %s/sld/1.1.0/DescribeLayer.xsd\">\n", schemalocation);
        msIO_printf("<Version>%s</Version>\n",sld_version);
        
    }
@@ -2945,7 +2945,7 @@
              {
                  msIO_printf("  <LayerDescription>\n");
                  msIO_printf("    <owsType>wfs</owsType>\n");
-                 msIO_printf("    <se:OnlineResource xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"%s\"/>\n", 
+                 msIO_printf("    <se:OnlineResource xlink:type=\"simple\" xlink:href=\"%s\"/>\n", 
                              pszOnlineResEncoded);
                  msIO_printf("    <TypeName>\n");
                  msIO_printf("      <se:FeatureTypeName>%s</se:FeatureTypeName>\n",pszLayerName);
@@ -2976,7 +2976,7 @@
                {
                    msIO_printf("  <LayerDescription>\n");
                    msIO_printf("    <owsType>wcs</owsType>\n");
-                   msIO_printf("    <se:OnlineResource  xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\" xlink:href=\"%s\"/>\n", 
+                   msIO_printf("    <se:OnlineResource xlink:type=\"simple\" xlink:href=\"%s\"/>\n", 
                                pszOnlineResEncoded);
                    msIO_printf("    <TypeName>\n");
                    msIO_printf("      <se:CoverageTypeName>%s</se:CoverageTypeName>\n",pszLayerName);
@@ -3001,7 +3001,7 @@
                  else
                     msIO_printf("    <owsType>wfs</owsType>\n");
 
-                 msIO_printf("    <se:OnlineResource  xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:type=\"simple\"/>\n"); 
+                 msIO_printf("    <se:OnlineResource xlink:type=\"simple\"/>\n"); 
                  msIO_printf("    <TypeName>\n");
                  if (lp->type == MS_LAYER_RASTER && lp->connectiontype != MS_WMS)
                    msIO_printf("      <se:CoverageTypeName>%s</se:CoverageTypeName>\n",pszLayerName);