[mapserver-commits] r11955 - sandbox/inspire_soc2011/mapserver

[svn at osgeo.org]

Author: stefanl
Date: 2011-07-18 22:14:57 -0700 (Mon, 18 Jul 2011)
New Revision: 11955

Modified:
   sandbox/inspire_soc2011/mapserver/mapows.c
   sandbox/inspire_soc2011/mapserver/rfc73.rst
Log:
use required MandatoryKeyword instead of Keyword(scenario2) in ExtendedCapabilities, update of rfc draft

Modified: sandbox/inspire_soc2011/mapserver/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c	2011-07-18 22:54:28 UTC (rev 11954)
+++ sandbox/inspire_soc2011/mapserver/mapows.c	2011-07-19 05:14:57 UTC (rev 11955)
@@ -967,7 +967,7 @@
         msIO_fprintf(stream, "    </inspire_common:MetadataPointOfContact>\n");
         msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_metadatadate", OWS_WARN, "      <inspire_common:MetadataDate>%s</inspire_common:MetadataDate>\n", "");
         msIO_fprintf(stream,"    <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>\n");
-        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_keyword", OWS_WARN, "    <inspire_common:Keyword xsi:type='inspire_common:classificationOfSpatialDataService'>\n      <inspire_common:KeywordValue>%s</inspire_common:KeywordValue>\n    </inspire_common:Keyword>\n", "");
+        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_keyword", OWS_WARN, "    <inspire_common:MandatoryKeyword xsi:type='inspire_common:classificationOfSpatialDataService'>\n      <inspire_common:KeywordValue>%s</inspire_common:KeywordValue>\n    </inspire_common:MandatoryKeyword>\n", "");
     }
     else
     {

Modified: sandbox/inspire_soc2011/mapserver/rfc73.rst
===================================================================
--- sandbox/inspire_soc2011/mapserver/rfc73.rst	2011-07-18 22:54:28 UTC (rev 11954)
+++ sandbox/inspire_soc2011/mapserver/rfc73.rst	2011-07-19 05:14:57 UTC (rev 11955)
@@ -7,7 +7,7 @@
 :Date:  2011/07/01
 :Author: gsoc2011
 :Contact: 
-:Last Edited:  2011/07/15
+:Last Edited:  2011/07/19
 :Status: 
 :Version: MapServer 6.2
 :Id: 
@@ -139,7 +139,7 @@
     "wms_inspire_temporal_reference" "2011-09-19"             #date of last revision, value according YYYY-MM-DD
     "wms_inspire_conformity" "not evaluated"                  #value either "conformant"|"not conformant"|default "not evaluated"
     "wms_inspire_mpoc_name" "mympocname"                      #point of contact
-    "wms_inspire_mpoc_email" "mympocemail"                    #point of contact
+    "wms_inspire_mpoc_email" "mympoc at e.mail"                  #point of contact
     "wms_inspire_metadatadate" "2011-09-19"                   #value according YYYY-MM-DD
     "wms_inspire_keyword" "infoMapAccessService"              #value according "classification of spatial data services"
     "wms_title" "myservicetitle"