[mapserver-commits] r13046 - in sandbox/inspire_soc2011: mapserver mapserver/mapscript/php msautotest msautotest/wxs msautotest/wxs/expected

svn at osgeo.org svn at osgeo.org
Sun Feb 5 17:19:54 EST 2012 

Author: schpidi
Date: 2012-02-05 14:19:54 -0800 (Sun, 05 Feb 2012)
New Revision: 13046

Modified:
   sandbox/inspire_soc2011/mapserver/
   sandbox/inspire_soc2011/mapserver/mapows.c
   sandbox/inspire_soc2011/mapserver/mapscript/php/
   sandbox/inspire_soc2011/msautotest/
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
   sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
   sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
Log:
Adding "wms_inspire_resourcelocator" to provide further control of inspire metadata in inspire sandbox.



Property changes on: sandbox/inspire_soc2011/mapserver
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11677-13031
   + /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11677-13043

Modified: sandbox/inspire_soc2011/mapserver/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/mapserver/mapows.c	2012-02-05 22:19:54 UTC (rev 13046)
@@ -1119,7 +1119,7 @@
     }
     else if (strcasecmp("embed",inspire_capabilities) == 0)
     {
-        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "onlineresource", OWS_NOERR, "    <inspire_common:ResourceLocator>\n      <inspire_common:URL>%s</inspire_common:URL>\n    </inspire_common:ResourceLocator>\n", NULL);
+        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_resourcelocator", OWS_NOERR, "    <inspire_common:ResourceLocator>\n      <inspire_common:URL>%s</inspire_common:URL>\n    </inspire_common:ResourceLocator>\n", NULL);
         msIO_fprintf(stream,"    <inspire_common:ResourceType>service</inspire_common:ResourceType>\n");
         msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_temporal_reference", OWS_WARN, "    <inspire_common:TemporalReference>\n      <inspire_common:DateOfLastRevision>%s</inspire_common:DateOfLastRevision>\n    </inspire_common:TemporalReference>\n", "");
         msIO_fprintf(stream, "    <inspire_common:Conformity>\n");


Property changes on: sandbox/inspire_soc2011/mapserver/mapscript/php
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11677-13031
   + /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11677-13043


Property changes on: sandbox/inspire_soc2011/msautotest
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/msautotest:11678-13031
   + /trunk/msautotest:11678-13043

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130.xml	2012-02-05 22:19:54 UTC (rev 13046)
@@ -79,7 +79,7 @@
   </Exception>
   <inspire_vs:ExtendedCapabilities>
     <inspire_common:ResourceLocator>
-      <inspire_common:URL>http://path/to/onlineresource...</inspire_common:URL>
+      <inspire_common:URL>http://myinspireresource</inspire_common:URL>
     </inspire_common:ResourceLocator>
     <inspire_common:ResourceType>service</inspire_common:ResourceType>
     <inspire_common:TemporalReference>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_eng.xml	2012-02-05 22:19:54 UTC (rev 13046)
@@ -79,7 +79,7 @@
   </Exception>
   <inspire_vs:ExtendedCapabilities>
     <inspire_common:ResourceLocator>
-      <inspire_common:URL>http://path/to/onlineresource...</inspire_common:URL>
+      <inspire_common:URL>http://myinspireresource</inspire_common:URL>
     </inspire_common:ResourceLocator>
     <inspire_common:ResourceType>service</inspire_common:ResourceType>
     <inspire_common:TemporalReference>

Modified: sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/msautotest/wxs/expected/wms_inspire_scenario2_cap130_ger.xml	2012-02-05 22:19:54 UTC (rev 13046)
@@ -79,7 +79,7 @@
   </Exception>
   <inspire_vs:ExtendedCapabilities>
     <inspire_common:ResourceLocator>
-      <inspire_common:URL>http://path/to/onlineresource...</inspire_common:URL>
+      <inspire_common:URL>http://myinspireresource</inspire_common:URL>
     </inspire_common:ResourceLocator>
     <inspire_common:ResourceType>service</inspire_common:ResourceType>
     <inspire_common:TemporalReference>

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map	2012-02-05 22:19:54 UTC (rev 13046)
@@ -80,7 +80,6 @@
   "wms_title.ger" "myservicetitleger"
   "wms_abstract" "myserviceabstract"                                            #to test fallback
   "wms_abstract.ger" "myserviceabstractger"
-  #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2"                         #will be ignored
   "wms_onlineresource" "http://path/to/onlineresource..."
   "wms_updatesequence" "myupdatesequence"
   "wms_srs" "EPSG:4326 EPSG:4269 EPSG:3035"

Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2012-02-05 21:03:32 UTC (rev 13045)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario2.map	2012-02-05 22:19:54 UTC (rev 13046)
@@ -76,6 +76,7 @@
   "wms_inspire_mpoc_name" "mympocname"                                          #point of contact
   "wms_inspire_mpoc_email" "mympoc at e.mail"                                      #point of contact
   "wms_inspire_metadatadate" "2011-09-19"
+  "wms_inspire_resourcelocator" "http://myinspireresource"                      #URL for ResourceLocator
   "wms_inspire_keyword" "infoMapAccessService"                                  #value according "classification of spatial data services"
   "wms_keywordlist_ISO_items" "infoMapAccessService"                            #value according "classification of spatial data services"
   "wms_keywordlist_vocabulary" "ISO"
@@ -83,7 +84,6 @@
   "wms_title.ger" "myservicetitleger"
   "wms_abstract" "myserviceabstract"                                            #to test fallback
   "wms_abstract.ger" "myserviceabstractger"
-  #"wms_keywordlist" "ignoredkeyword1, ignoredkeyword2"                         #will be ignored
   "wms_onlineresource" "http://path/to/onlineresource..."
   "wms_updatesequence" "myupdatesequence"
   "wms_srs" "EPSG:4326 EPSG:4269 EPSG:3035"

More information about the mapserver-commits mailing list