Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  use separate message property for display in cite view
  make creator roles configurable and show interviewer comparable to edt (#280)
  • Loading branch information
kkrebs committed Apr 17, 2023
2 parents a346d7c + 59a8339 commit ba69796
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,9 @@ MCR.user2.LDAP.Mapping.explicit=id_orcid:eduPersonOrcid
UBO.Search.PersonalList.Roles=aut.top,cre.top,tch.top,pht.top,prg.top,edt.top
UBO.Search.PersonalList.Ids=%MCR.user2.matching.lead_id%,dhsbid

# roles considered DC.Creator
UBO.CreatorRoles=cre aut tch pht prg

######################################################################
# #
# Command Line Interface #
Expand Down
2 changes: 1 addition & 1 deletion ubo-common/src/main/resources/xsl/mods-dc.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

<!-- DC.Creator -->

<xsl:template match="mods:name[mods:role/mods:roleTerm][contains($creator.roles,mods:role/mods:roleTerm[@type='code'])]" mode="dc" priority="1">
<xsl:template match="mods:name[mods:role/mods:roleTerm][contains($UBO.CreatorRoles,mods:role/mods:roleTerm[@type='code'])]" mode="dc" priority="1">
<dc:creator>
<xsl:apply-templates select="." />
</dc:creator>
Expand Down
21 changes: 15 additions & 6 deletions ubo-common/src/main/resources/xsl/mods-display.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<xsl:param name="UBO.JOP.Parameters" />
<xsl:param name="UBO.JOP.URL" />
<xsl:param name="UBO.URI.gbv.de.ppn.redirect" />
<xsl:param name="UBO.CreatorRoles" select="'cre aut tch pht prg'" /> <!-- Rollen, die als DC.Creator betrachtet werden -->

<!-- Expect one more author to be displayed as the last author is always getting displayed -->
<xsl:param name="UBO.Initially.Visible.Authors" select="14" />
Expand Down Expand Up @@ -319,7 +320,7 @@
<xsl:param name="mode">plain</xsl:param>

<xsl:call-template name="output.line">
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm][contains($creator.roles,mods:role/mods:roleTerm[@type='code'])]" />
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm][contains($UBO.CreatorRoles,mods:role/mods:roleTerm[@type='code'])]" />
<xsl:with-param name="after" select="': '" />
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'authors'" />
Expand All @@ -330,6 +331,12 @@
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'editors'" />
</xsl:call-template>
<xsl:call-template name="output.line">
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm='ivr']" />
<xsl:with-param name="after" select="concat(' ',i18n:translate('ubo.interviewer.abbreviated'),': ')" />
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'interviewer'" />
</xsl:call-template>
<xsl:call-template name="output.line">
<xsl:with-param name="selected" select="mods:titleInfo[1]" />
<xsl:with-param name="mode" select="$mode" />
Expand All @@ -342,7 +349,7 @@
<xsl:param name="mode">plain</xsl:param>

<xsl:call-template name="output.line">
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm][contains($creator.roles,mods:role/mods:roleTerm[@type='code'])]" />
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm][contains($UBO.CreatorRoles,mods:role/mods:roleTerm[@type='code'])]" />
<xsl:with-param name="after" select="': '" />
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'authors'" />
Expand All @@ -359,6 +366,12 @@
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'editors'" />
</xsl:call-template>
<xsl:call-template name="output.line">
<xsl:with-param name="selected" select="mods:name[mods:role/mods:roleTerm='ivr']" />
<xsl:with-param name="after" select="concat(' ',i18n:translate('ubo.interviewer.abbreviated'),'. ')" />
<xsl:with-param name="mode" select="$mode" />
<xsl:with-param name="class" select="'interviewer'" />
</xsl:call-template>
</xsl:template>

<!-- ========== Ausgabe einer Zeile in Zitierform ========== -->
Expand Down Expand Up @@ -1100,10 +1113,6 @@
<xsl:param name="CurrentLang" />
<xsl:param name="DefaultLang" />

<!-- ========== Rollen, die als DC.Creator betrachtet werden ========== -->

<xsl:variable name="creator.roles">cre aut tch pht prg</xsl:variable>

<!-- ========== Titel ========== -->
<xsl:template match="mods:titleInfo">
<xsl:apply-templates select="mods:nonSort" />
Expand Down

0 comments on commit ba69796

Please sign in to comment.