feature bugs oai

This commit is contained in:
Arno Kaimbacher 2022-02-04 17:07:30 +01:00
parent 526b48b06e
commit 46a68e5418
4 changed files with 67 additions and 42 deletions

View File

@ -34,12 +34,12 @@ trait DatasetExtension
), ),
'TitleAbstract' => array( 'TitleAbstract' => array(
'model' => Description::class, 'model' => Description::class,
'options' => array('type' => ['Abstract']), 'options' => array('type' => ['Abstract', 'Translated']),
'fetch' => 'eager' 'fetch' => 'eager'
), ),
'TitleAbstractAdditional' => array( 'TitleAbstractAdditional' => array(
'model' => Description::class, 'model' => Description::class,
'options' => array('type' => ['Translated', 'Methods', 'Technical_info', 'Series_information', 'Other']), 'options' => array('type' => ['Methods', 'Technical_info', 'Series_information', 'Other']),
'fetch' => 'eager' 'fetch' => 'eager'
), ),
'Licence' => array( 'Licence' => array(

View File

@ -564,7 +564,14 @@
<xsl:template match="File/@MimeType" mode="oai_dc"> <xsl:template match="File/@MimeType" mode="oai_dc">
<dc:format> <dc:format>
<xsl:choose>
<xsl:when test=". = 'application/x-sqlite3'">
<xsl:text>application/geopackage+sqlite3</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="." /> <xsl:value-of select="." />
</xsl:otherwise>
</xsl:choose>
</dc:format> </dc:format>
</xsl:template> </xsl:template>

View File

@ -183,7 +183,8 @@
</xsl:attribute> </xsl:attribute>
<xsl:if test="@Type != ''"> <xsl:if test="@Type != ''">
<xsl:attribute name="descriptionType"> <xsl:attribute name="descriptionType">
<xsl:value-of select="@Type" /> <!-- <xsl:value-of select="@Type" /> -->
<xsl:text>Abstract</xsl:text>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:value-of select="@Value" /> <xsl:value-of select="@Value" />

View File

@ -185,7 +185,8 @@
</xsl:attribute> </xsl:attribute>
<xsl:if test="@Type != ''"> <xsl:if test="@Type != ''">
<xsl:attribute name="descriptionType"> <xsl:attribute name="descriptionType">
<xsl:value-of select="@Type" /> <!-- <xsl:value-of select="@Type" /> -->
<xsl:text>Abstract</xsl:text>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:value-of select="@Value" /> <xsl:value-of select="@Value" />
@ -261,11 +262,20 @@
<xsl:value-of select="@Language" /> <xsl:value-of select="@Language" />
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:if test="@Type != '' and @Type != 'Main'"> <xsl:choose>
<xsl:when test="@Type != '' and @Type != 'Sub' and @Type != 'Main'">
<xsl:attribute name="titleType"> <xsl:attribute name="titleType">
<xsl:value-of select="@Type" /> <xsl:value-of select="@Type" />
<xsl:text>Title</xsl:text>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:when>
<xsl:when test="@Type = 'Sub'">
<xsl:attribute name="titleType">
<xsl:value-of select="@Type" />
<xsl:text>title</xsl:text>
</xsl:attribute>
</xsl:when>
</xsl:choose>
<xsl:value-of select="@Value"/> <xsl:value-of select="@Value"/>
</title> </title>
</xsl:template> </xsl:template>
@ -371,7 +381,14 @@
<xsl:template match="File/@MimeType" mode="oai_datacite" <xsl:template match="File/@MimeType" mode="oai_datacite"
xmlns="http://datacite.org/schema/kernel-4"> xmlns="http://datacite.org/schema/kernel-4">
<format> <format>
<xsl:choose>
<xsl:when test=". = 'application/x-sqlite3'">
<xsl:text>application/geopackage+sqlite3</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="." /> <xsl:value-of select="." />
</xsl:otherwise>
</xsl:choose>
</format> </format>
</xsl:template> </xsl:template>