diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl index d86da928861..b7179ae5870 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl @@ -19,7 +19,7 @@ xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" - xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" + xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-catalog.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-catalog.xsl index 230a1f7947f..4af99baced1 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-catalog.xsl +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-catalog.xsl @@ -19,7 +19,7 @@ xmlns:msr="http://standards.iso.org/iso/19115/-3/msr/2.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mdq="http://standards.iso.org/iso/19157/-2/mdq/1.0" - xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" + xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:gex="http://standards.iso.org/iso/19115/-3/gex/1.0" xmlns:gml="http://www.opengis.net/gml/3.2" diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataservice.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataservice.xsl index c1daa81c24a..0eb173b1455 100644 --- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataservice.xsl +++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataservice.xsl @@ -4,15 +4,24 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" - xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.1" + xmlns:srv="http://standards.iso.org/iso/19115/-3/srv/2.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" + xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:dcat="http://www.w3.org/ns/dcat#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" exclude-result-prefixes="#all"> - + + + + - + match="srv:containsOperations/*/srv:connectPoint/*[not( + matches(cit:protocol/(gco:CharacterString|gcx:Anchor)/text(), $endpointDescriptionProtocolsExpression, 'i') + or matches(cit:linkage/(gco:CharacterString|gcx:Anchor)/text(), $endpointDescriptionUrllExpression, 'i'))]/cit:linkage"> + + @@ -31,11 +43,19 @@ Domain: dcat:DataService Range: rdfs:Resource Usage note: The endpoint description gives specific details of the actual endpoint instances, while dcterms:conformsTo is used to indicate the general standard or specification that the endpoints implement. - Usage note: An endpoint description may be expressed in a machine-readable form, such as an OpenAPI (Swagger) description [OpenAPI], an OGC GetCapabilities response [WFS], [ISO-19142], [WMS], [ISO-19128], a SPARQL Service Description [SPARQL11-SERVICE-DESCRIPTION], an [OpenSearch] or [WSDL20] document, a Hydra API description [HYDRA], else in text or some other informal mode if a formal representation is not possible. + Usage note: An endpoint description may be expressed in a machine-readable form, such as an OpenAPI (Swagger) description [OpenAPI], + an OGC GetCapabilities response [WFS], [ISO-19142], [WMS], [ISO-19128], + a SPARQL Service Description [SPARQL11-SERVICE-DESCRIPTION], + an [OpenSearch] + or [WSDL20] document, + a Hydra API description [HYDRA], + else in text or some other informal mode if a formal representation is not possible. --> - + match="srv:containsOperations/*/srv:connectPoint/*[ + matches(cit:protocol/(gco:CharacterString|gcx:Anchor)/text(), $endpointDescriptionProtocolsExpression, 'i') + or matches(cit:linkage/(gco:CharacterString|gcx:Anchor)/text(), $endpointDescriptionUrllExpression, 'i')]/cit:linkage"> +