[mapserver-commits] r13035 - in sandbox/inspire_soc2011: mapserver
msautotest/wxs
svn at osgeo.org
svn at osgeo.org
Sat Feb 4 17:32:45 EST 2012
Author: schpidi
Date: 2012-02-04 14:32:45 -0800 (Sat, 04 Feb 2012)
New Revision: 13035
Modified:
sandbox/inspire_soc2011/mapserver/mapows.c
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
Log:
Renaming wms_metadataurl_href to wms_inspire_metadataurl_href in inspire sandbox as suggested by mko.
Modified: sandbox/inspire_soc2011/mapserver/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c 2012-02-04 22:15:00 UTC (rev 13034)
+++ sandbox/inspire_soc2011/mapserver/mapows.c 2012-02-04 22:32:45 UTC (rev 13035)
@@ -1101,11 +1101,11 @@
if (strcasecmp("url",inspire_capabilities) == 0)
{
- if ( msOWSLookupMetadata(&(map->web.metadata), namespaces, "metadataurl_href") != NULL )
+ if ( msOWSLookupMetadata(&(map->web.metadata), namespaces, "inspire_metadataurl_href") != NULL )
{
msIO_fprintf(stream, " <inspire_common:MetadataUrl xsi:type=\"inspire_common:resourceLocatorType\">\n");
- msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_href", OWS_WARN, " <inspire_common:URL>%s</inspire_common:URL>\n", "");
- msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "metadataurl_format", OWS_WARN, " <inspire_common:MediaType>%s</inspire_common:MediaType>\n", "");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_metadataurl_href", OWS_WARN, " <inspire_common:URL>%s</inspire_common:URL>\n", "");
+ msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_metadataurl_format", OWS_WARN, " <inspire_common:MediaType>%s</inspire_common:MediaType>\n", "");
msIO_fprintf(stream, " </inspire_common:MetadataUrl>\n");
}
else
@@ -1113,7 +1113,7 @@
status = action_if_not_found;
if (OWS_WARN == action_if_not_found)
{
- msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "metadataurl_href");
+ msIO_fprintf(stream, "<!-- WARNING: Mandatory metadata '%s%s' was missing in this context. -->\n", (namespaces?"..._":""), "inspire_metadataurl_href");
}
}
}
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-04 22:15:00 UTC (rev 13034)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire.map 2012-02-04 22:32:45 UTC (rev 13035)
@@ -148,9 +148,9 @@
METADATA
"wms_inspire_capabilities" "url" #enables inspire using scenario 1
"wms_inspire_languages" "ger,eng" #first default, values according ISO 639-2/B
- "wms_metadataurl_href" "http://www.geodaten-mv.de/soapServices/CSWStartup?service=CSW&version=2.0.2&request=GetRecordById&outputSchema=http://www.isotc211.org/2005/gmd&ElementSetName=full&Id=4d5f1402-5b2b-43ec-949f-92d125179318"
- "wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
- "wms_metadataurl_type" "ISO19115:2003"
+ "wms_inspire_metadataurl_href" "http://www.geodaten-mv.de/soapServices/CSWStartup?service=CSW&version=2.0.2&request=GetRecordById&outputSchema=http://www.isotc211.org/2005/gmd&ElementSetName=full&Id=4d5f1402-5b2b-43ec-949f-92d125179318"
+ "wms_inspire_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
+ "wms_inspire_metadataurl_type" "ISO19115:2003"
"wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
"wms_title.eng" "INSPIRE test service"
@@ -195,6 +195,9 @@
"wms_authorityurl_href" "http://www.geodaten-mv.de/geomis/"
"wms_identifier_authority" "GeoPortal.MV"
"wms_identifier_value" "http://www.geodaten-mv.de/geomis/#3efef5cf-8643-4e72-92db-6ca4554c12c7"
+ "wms_metadataurl_href" "http://www.geodaten-mv.de/soapServices/CSWStartup?service=CSW&version=2.0.2&request=GetRecordById&outputSchema=http://www.isotc211.org/2005/gmd&ElementSetName=full&Id=4d5f1402-5b2b-43ec-949f-92d125179318"
+ "wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
+ "wms_metadataurl_type" "ISO19115:2003"
"wms_enable_request" "*"
"wms_sld_enabled" "false"
Modified: sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map
===================================================================
--- sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2012-02-04 22:15:00 UTC (rev 13034)
+++ sandbox/inspire_soc2011/msautotest/wxs/wms_inspire_scenario1.map 2012-02-04 22:32:45 UTC (rev 13035)
@@ -72,9 +72,9 @@
METADATA
"wms_inspire_capabilities" "url" #enables inspire using scenario 1
"wms_inspire_languages" "eng,ger" #first default, values according ISO 639-2/B
- "wms_metadataurl_href" "http://inspire.service/metadata"
- "wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
- "wms_metadataurl_type" "ISO19115:2003"
+ "wms_inspire_metadataurl_href" "http://inspire.service/metadata"
+ "wms_inspire_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
+ "wms_inspire_metadataurl_type" "ISO19115:2003"
"wms_inspire_keyword" "infoMapAccessService" #value according "classification of spatial data services"
"wms_title.eng" "myservicetitle"
"wms_title.ger" "myservicetitleger"
@@ -106,6 +106,9 @@
"wms_rootlayer_abstract" "myroadarealayerabstract" #to test fallback
"wms_rootlayer_abstract.ger" "myroadareaabstractger"
"wms_rootlayer_keywordlist" "myroadareakeyword1,myroadareakeyword2"
+ "wms_metadataurl_href" "http://inspire.service/metadata"
+ "wms_metadataurl_format" "application/vnd.ogc.csw.capabilities.response_xml"
+ "wms_metadataurl_type" "ISO19115:2003"
"wms_style_name" "inspire_common:DEFAULT" #style name
"wms_style_title" "myroadarealayerstyletitle" #style title
"wms_style_legendurl_width" "85" #override style legendurl (mandatory: width, height, format, href)
More information about the mapserver-commits
mailing list