[mapserver-commits] r12658 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: schpidi
Date: 2011-10-11 08:22:33 -0700 (Tue, 11 Oct 2011)
New Revision: 12658

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapwcs11.c
Log:
Fixing schema validity issue for WCS 1.1 GetCoverage responses (#4047).


Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-10-11 15:21:42 UTC (rev 12657)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-10-11 15:22:33 UTC (rev 12658)
@@ -14,6 +14,8 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+- Fixed schema validity issue for WCS 1.1 GetCoverage responses (#4047)
+
 - fix centroid geomtransform parser (#4029)
 
 - PHP MapScript is missing many styleObj properties (#3901)

Modified: branches/branch-6-0/mapserver/mapwcs11.c
===================================================================
--- branches/branch-6-0/mapserver/mapwcs11.c	2011-10-11 15:21:42 UTC (rev 12657)
+++ branches/branch-6-0/mapserver/mapwcs11.c	2011-10-11 15:22:33 UTC (rev 12658)
@@ -1207,7 +1207,7 @@
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
             "<Coverages\n"
             "     xmlns=\"http://www.opengis.net/wcs/1.1\"\n"
-            "     xmlns:ows=\"http://www.opengis.net/ows\"\n"
+            "     xmlns:ows=\"http://www.opengis.net/ows/1.1\"\n"
             "     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
             "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
             "     xsi:schemaLocation=\"http://www.opengis.net/ows/1.1 ../owsCoverages.xsd\">\n"
@@ -1225,7 +1225,7 @@
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
             "<Coverages\n"
             "     xmlns=\"http://www.opengis.net/wcs/1.1\"\n"
-            "     xmlns:ows=\"http://www.opengis.net/ows\"\n"
+            "     xmlns:ows=\"http://www.opengis.net/ows/1.1\"\n"
             "     xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n"
             "     xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
             "     xsi:schemaLocation=\"http://www.opengis.net/ows/1.1 ../owsCoverages.xsd\">\n"
@@ -1241,7 +1241,7 @@
     {
         msIO_fprintf( 
             stdout,
-            "    <Reference xlink:href=\"cid:coverage/wcs.%s\"/>\n"
+            "    <ows:Reference xlink:href=\"cid:coverage/wcs.%s\"/>\n"
             "  </Coverage>\n"
             "</Coverages>\n"
             "--wcs\n"
@@ -1300,7 +1300,7 @@
         
         msIO_fprintf( 
             stdout,
-            "    <Reference xlink:href=\"cid:coverage/%s\"/>\n"
+            "    <ows:Reference xlink:href=\"cid:coverage/%s\"/>\n"
             "  </Coverage>\n"
             "</Coverages>\n",
             CPLGetFilename(filename) );