Changeset 11838


Ignore:
Timestamp:
Jun 19, 2011 11:09:04 PM (5 years ago)
Author:
stefanl
Message:

inspire view service metadata support (scenario1+2)

Location:
sandbox/inspire_soc2011/mapserver
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sandbox/inspire_soc2011/mapserver/mapows.c

    r11833 r11838  
    958958    else if (strcasecmp("embed",inspire_capabilities) == 0)
    959959    {
    960         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);
    961         msIO_fprintf(stream,"       <inspire_common:ResourceType>service</inspire_common:ResourceType>\n");
    962         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", "");
    963         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", "");
     960        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);
     961        msIO_fprintf(stream,"    <inspire_common:ResourceType>service</inspire_common:ResourceType>\n");
     962        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", "");
     963        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", "");
    964964        msIO_fprintf(stream, "    <inspire_common:MetadataPointOfContact>\n");
    965965        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_mpoc_name", OWS_WARN, "      <inspire_common:OrganisationName>%s</inspire_common:OrganisationName>\n", "");
     
    967967        msIO_fprintf(stream, "    </inspire_common:MetadataPointOfContact>\n");
    968968        msOWSPrintEncodeMetadata(stream, &(map->web.metadata), namespaces, "inspire_metadatadate", OWS_WARN, "      <inspire_common:MetadataDate>%s</inspire_common:MetadataDate>\n", "");
    969         msIO_fprintf(stream,"       <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>\n");
    970         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", "");
     969        msIO_fprintf(stream,"    <inspire_common:SpatialDataServiceType>view</inspire_common:SpatialDataServiceType>\n");
     970        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", "");
    971971    }
    972972    else
  • sandbox/inspire_soc2011/mapserver/mapwms.c

    r11837 r11838  
    21892189  else if (nVersion >= OWS_1_3_0 && msOWSLookupMetadata(&(map->web.metadata), "MO", "inspire_capabilities") )
    21902190  {
    2191         msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO", "inspire_keyword", OWS_WARN, "      <KeywordList>        <Keyword vocabulary='ISO'>%s</Keyword>\n</KeywordList>\n", "");
     2191        msOWSPrintEncodeMetadata(stdout, &(map->web.metadata), "MO", "inspire_keyword", OWS_WARN, "  <KeywordList>\n    <Keyword vocabulary='ISO'>%s</Keyword>\n  </KeywordList>\n", "");
    21922192  }
    21932193  else
Note: See TracChangeset for help on using the changeset viewer.