Commit 1b033421 authored by Kim Mortimer's avatar Kim Mortimer
Browse files

Adding some fixes from recent changes - will editor break?

parent 9f1a28da
......@@ -178,7 +178,6 @@
select="concat('#',upper-case(java:twoCharLangCode($isoDocLangId)))"/>
<xsl:variable name="identification" select="/*[name(.)='gmi:MI_Metadata' or
name() = 'gmi:MI_Metadata' or
@gco:isoType='gmd:MD_Metadata']/gmd:identificationInfo/*"></xsl:variable>
<xsl:variable name="docLangTitle"
select="$identification/gmd:citation/*/gmd:title//gmd:LocalisedCharacterString[@locale=$poundLangId]"/>
......
......@@ -130,7 +130,7 @@ xmlns:gco="http://www.isotc211.org/2005/gco">
<!-- Type - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- nb: this doesn't use the DCMI Type Vocabulary but MD_ScopeCode -->
<!-- trying to use our reduced codelist instead, as that's slightly closer-->
<xsl:for-each select="gmd:hierarchyLevel/gmd:MD_MetadataScopeCode/@codeListValue">
<xsl:for-each select="gmd:hierarchyLevel/gmd:MD_ScopeCode/@codeListValue">
<dc:type><xsl:value-of select="."/></dc:type>
</xsl:for-each>
......
......@@ -44,7 +44,7 @@
<xsl:import href="utility-fn.xsl"/>
<xsl:import href="utility-tpl.xsl"/>
<xsl:template mode="csv" match="gmi:MI_Metadata|*[@gco:isoType='gmi:MI_Metadata']"
<xsl:template mode="csv" match="gmi:MI_Metadata|*[@gco:isoType='gmd:MD_Metadata']"
priority="2">
<xsl:variable name="langId" select="gn-fn-iso19139.MERIDIAN:getLangIdMER(., $lang)"/>
<xsl:variable name="info" select="gn:info"/>
......
......@@ -60,7 +60,7 @@
Create reference block to metadata record and dataset to be added in dcat:Catalog usually.
-->
<!-- FIXME : $url comes from a global variable. -->
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmi:MI_Metadata']" mode="record-reference">
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmd:MD_Metadata']" mode="record-reference">
<!-- TODO : a metadata record may contains aggregate. In that case create one dataset per aggregate member. -->
<dcat:dataset rdf:resource="{$resourcePrefix}/datasets/{iso19139.MERIDIAN:getResourceCode(.)}"/>
<dcat:record rdf:resource="{$resourcePrefix}/records/{gmd:fileIdentifier/gco:CharacterString}"/>
......@@ -70,7 +70,7 @@
<!--
Convert ISO record to DCAT
-->
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmi:MI_Metadata']" mode="to-dcat">
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmd:MD_Metadata']" mode="to-dcat">
<!-- Catalogue records
......@@ -131,7 +131,7 @@
</xsl:template>
<!-- Create all references for ISO19139 record (if rdf.metadata.get) or records (if rdf.search) -->
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmi:MI_Metadata']" mode="references">
<xsl:template match="gmi:MI_Metadata|*[@gco:isoType='gmd:MD_Metadata']" mode="references">
<!-- Keywords -->
<xsl:for-each-group
......
......@@ -4871,7 +4871,7 @@
<element name="MER:MD_DataIdentification" id="55536.0">
<label>MERIDIAN DataIdentification</label>
<description></description>
<description>Information required to identify a dataset</description>
</element>
<!-- ================================== -->
......
......@@ -48,7 +48,7 @@
FIXME : gmd:PT_FreeText should not be in the match clause as gco:CharacterString
is mandatory and PT_FreeText optional. Added for testing GM03 import.
-->
<xsl:template name="localised" mode="localised" match="*[gco:CharacterString or gmd:PT_FreeText]">
<xsl:template name="localisedMER" mode="localised" match="*[gco:CharacterString or gmd:PT_FreeText]">
<xsl:param name="langId"/>
<xsl:choose>
......
......@@ -4466,6 +4466,7 @@
<xsl:template mode="iso19139.MERIDIAN"
match="gmd:*[gco:CharacterString or gmd:PT_FreeText]|
gmi:*[gco:CharacterString or gmd:PT_FreeText]|
MER:*[gco:CharacterString or gmd:PT_FreeText]|
srv:*[gco:CharacterString or gmd:PT_FreeText]|
gco:aName[gco:CharacterString]"
>
......
......@@ -155,7 +155,7 @@
<xsl:copy-of select="@*"/>
<!-- Copy all elements from AbstractMD_IdentificationType-->
<xsl:copy-of
select="gmd:*|MER:*|gmi:*"/>
select="gmd:*|MER:*|gmi:*|dwr:*|dwc:*|dcterms:*"/>
<!-- Service -->
......
......@@ -11,11 +11,12 @@ xmlns:MER="https://meridian.cs.dal.ca/" targetNamespace="https://meridian.cs.dal
>
<xs:include schemaLocation="schema/extensions/MERIDIANExtensions.xsd"/>
<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="schema/gco/gco.xsd"/>
<!--<xs:import namespace="http://www.isotc211.org/2005/gco" schemaLocation="schema/gco/gco.xsd"/>
<xs:import namespace="http://www.isotc211.org/2005/gts" schemaLocation="schema/gts/gts.xsd"/>
<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="schema/gmd/gmd.xsd"/>
<xs:import namespace="http://www.isotc211.org/2005/gmd" schemaLocation="schema/gmd/gmd.xsd"/>-->
<xs:import namespace="http://www.isotc211.org/2005/srv" schemaLocation="schema/srv/srv.xsd"/>
<xs:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="schema/gml/gml.xsd"/>
<xs:import namespace="http://www.isotc211.org/2005/gmx" schemaLocation="schema/gmx/gmx.xsd"/>
<!-- is there too much stuff here? -->
<!-- Need to adjust path/namespace most likely! -->
<!--xs:include schemaLocation="schema/gmi/gmi.xsd"/-->
......
......@@ -23,7 +23,7 @@
-->
<criteriaTypes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../criteria-type.xsd">
xsi:noNamespaceSchemaLocation="criteria-type.xsd">
<type>
<value>*//gmd:keyword/gco:CharacterString/text() =
'@@value@@'__OR__*//gmd:keyword/gmd:PT_FreeText/gmd:textGroup/gmd:LocalisedCharacterString/text()
......
......@@ -54,5 +54,5 @@ xmlns:MER="https://meridian.cs.dal.ca/">
</xsl:template>
<!-- ================================================================= -->
<xsl:template match="geonet:info" priority="2"/>
</xsl:stylesheet>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment