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

[svn at osgeo.org]

Author: stefanl
Date: 2011-06-19 23:09:04 -0700 (Sun, 19 Jun 2011)
New Revision: 11838

Modified:
   sandbox/inspire_soc2011/mapserver/mapows.c
   sandbox/inspire_soc2011/mapserver/mapwms.c
Log:
inspire view service metadata support (scenario1+2)

Modified: sandbox/inspire_soc2011/mapserver/mapows.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapows.c	2011-06-20 05:52:53 UTC (rev 11837)
+++ sandbox/inspire_soc2011/mapserver/mapows.c	2011-06-20 06:09:04 UTC (rev 11838)
@@ -957,17 +957,17 @@
     }
     else if (strcasecmp("embed",inspire_capabilities) == 0)
     {
-        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "onlineresource", OWS_NOERR, "      <inspire_common:ResourceLocator>        <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>        <inspire_common:DateOfLastRevision>%s</inspire_common:DateOfLastRevision>\n</inspire_common:TemporalReference>\n", "");
-        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_conformity", OWS_WARN, "      <inspire_common:Conformity>        <inspire_common:Degree>%s</inspire_common:Degree>\n</inspire_common:Conformity>\n", "");
+        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);
+        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", "");
+        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_conformity", OWS_WARN, "    <inspire_common:Conformity>\n      <inspire_common:Degree>%s</inspire_common:Degree>\n    </inspire_common:Conformity>\n", "");
         msIO_fprintf(stream, "    <inspire_common:MetadataPointOfContact>\n");
         msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_name", OWS_WARN, "      <inspire_common:OrganisationName>%s</inspire_common:OrganisationName>\n", "");
         msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_email", OWS_WARN, "      <inspire_common:EmailAddress>%s</inspire_common:EmailAddress>\n", "");
         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'>        <inspire_common:KeywordValue>%s</inspire_common:KeywordValue>\n</inspire_common:Keyword>\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", "");
     }
     else
     {

Modified: sandbox/inspire_soc2011/mapserver/mapwms.c
===================================================================
--- sandbox/inspire_soc2011/mapserver/mapwms.c	2011-06-20 05:52:53 UTC (rev 11837)
+++ sandbox/inspire_soc2011/mapserver/mapwms.c	2011-06-20 06:09:04 UTC (rev 11838)
@@ -2188,7 +2188,7 @@
   }
   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>        <Keyword vocabulary='ISO'>%s</Keyword>\n</KeywordList>\n", "");
+        msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO", "inspire_keyword", OWS_WARN, "  <KeywordList>\n    <Keyword vocabulary='ISO'>%s</Keyword>\n  </KeywordList>\n", "");
   }
   else
   {