[mapserver-commits] r11840 - in sandbox/inspire_soc2011: mapserver msautotest/wxs

[svn at osgeo.org]

Author: stefanl
Date: 2011-06-20 05:08:09 -0700 (Mon, 20 Jun 2011)
New Revision: 11840

Modified:
   sandbox/inspire_soc2011/mapserver/mapwms.c
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
inspire view service metadata support (scenario1+2)

Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c	2011-06-20 06:24:07 UTC (rev 11839)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c	2011-06-20 12:08:09 UTC (rev 11840)
@@ -2189,6 +2189,9 @@
   else if (nVersion >= OWS_1_3_0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") )
   {
         msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO", "inspire_keyword", OWS_WARN, "  <KeywordList>\n    <Keyword vocabulary='ISO'>%s</Keyword>\n  </KeywordList>\n", "");
+
+        if (msOWSLookupMetadata(&(map->web.metadata), "MO", "keywordlist") != NULL)
+            msIO_fprintf(stdout, "<!-- WARNING: ignoring service keywords provided in keywordlist -->");
   }
   else
   {

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-06-20 06:24:07 UTC (rev 11839)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2011-06-20 12:08:09 UTC (rev 11840)
@@ -47,6 +47,7 @@
   "wms_title_ger" "Verkehrsnetze: Straßenfläche"
   "wms_abstract" "myabstract"                               #to test fallback
   "wms_abstract_ger" "myabstractger"
+  #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2"     #will be ignored
   #"wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario1"
   "wms_updatesequence" "myupdatesequence"
   "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-06-20 06:24:07 UTC (rev 11839)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2011-06-20 12:08:09 UTC (rev 11840)
@@ -50,6 +50,7 @@
   "wms_title_ger" "Verkehrsnetze: Straßenfläche"
   "wms_abstract" "myabstract"                               #to test fallback
   "wms_abstract_ger" "myabstractger"
+  #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2"     #will be ignored
   #"wms_onlineresource" "http://localhost/path/to/wms_inspire_scenario2"
   "wms_updatesequence" "myupdatesequence"
   "wms_srs" "EPSG:42304 EPSG:42101 EPSG:4269 EPSG:4326"