Merge branch 'branch-6-0'

MapServer · May 3, 2012 · 17c7ed5 · 17c7ed5
2 parents 5f1766a + d0f3eb4
commit 17c7ed5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -16,6 +16,10 @@ Current Version (git master, 6.1-dev, future 6.2):
 
 - Fixed getFeature request with custom output format fails on filter encoding (#4190)
 
+- Fixed mapscript is unusable in a web application due to memory leaks (#4262)
+
+- Fixed getFeature request with custom output format fails on filter encoding (#4190)
+
 - Fixed resolution when UoM changes in WCS 2.0 (#4283)
 
 - Added missing DEFRESOLUTION parameter to msCopyMap() function (#4272) 

diff --git a/mapwcs20.c b/mapwcs20.c
@@ -2829,9 +2829,13 @@ static int msWCSGetCapabilities20_CoverageSummary(
 {
     wcs20coverageMetadataObj cm;
     int status;
-    xmlNodePtr psCSummary;
+    xmlNodePtr psCSummary, psMetadata;
+    const char *metadatalink_href = msOWSLookupMetadata(&(layer->metadata), "CO", "metadatalink_href");
+
 
     xmlNsPtr psWcsNs = xmlSearchNs( doc, xmlDocGetRootElement(doc), BAD_CAST "wcs" );
+    xmlNsPtr psOwsNs = xmlSearchNs( doc, xmlDocGetRootElement(doc), BAD_CAST "ows" );
+    xmlNsPtr psXlinkNs = xmlSearchNs( doc, xmlDocGetRootElement(doc), BAD_CAST "xlink" );
 
     status = msWCSGetCoverageMetadata20(layer, &cm);
     if(status != MS_SUCCESS) return MS_FAILURE;
@@ -2840,6 +2844,25 @@ static int msWCSGetCapabilities20_CoverageSummary(
     xmlNewChild(psCSummary, psWcsNs, BAD_CAST "CoverageId", BAD_CAST layer->name);
     xmlNewChild(psCSummary, psWcsNs, BAD_CAST "CoverageSubtype", BAD_CAST "RectifiedGridCoverage");
 
+    /* Add references to additional coverage metadata */
+    if (metadatalink_href != NULL)
+    {
+        const char *metadatalink_type = msOWSLookupMetadata(&(layer->metadata), "CO", "metadatalink_type");
+        const char *metadatalink_format = msOWSLookupMetadata(&(layer->metadata), "CO", "metadatalink_format");
+
+        psMetadata = xmlNewChild(psCSummary, psOwsNs, BAD_CAST "Metadata", NULL);
+        xmlNewNsProp(psMetadata, psXlinkNs, BAD_CAST "type", BAD_CAST "simple");
+        xmlNewNsProp(psMetadata, psXlinkNs, BAD_CAST "href", BAD_CAST metadatalink_href);
+        if (metadatalink_type != NULL)
+        {
+            xmlNewProp(psMetadata, BAD_CAST "about", BAD_CAST metadatalink_type);
+        }
+        if (metadatalink_format != NULL)
+        {
+            xmlNewNsProp(psMetadata, psXlinkNs, BAD_CAST "role", BAD_CAST metadatalink_format);
+        }
+    }
+
     msWCSClearCoverageMetadata20(&cm);
 
     return MS_SUCCESS;