Skip to content

MCR-3757 use xml:lang instead of lang() for classification label sele… #3039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michael-becker wants to merge 1 commit into
base: 2023.06.x
Choose a base branch
from
+8 −7
Open

MCR-3757 use xml:lang instead of lang() for classification label sele… #3039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions mycore-base/src/main/resources/xslt/functions/classification.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
<xsl:when test="$class[@classid and @categid]">
<xsl:sequence select="mcrclass:label($lang, document(concat('classification:metadata:0:children:',$class/@classid,':',$class/@categid))//category)" />
</xsl:when>
<xsl:when test="string-length($lang) > 0 and $class/label[lang($lang)]">
<xsl:sequence select="$class/label[lang($lang)]" />
<xsl:when test="string-length($lang) > 0 and $class/label[@xml:lang = $lang]">
<xsl:sequence select="$class/label[@xml:lang = $lang]" />
</xsl:when>
<xsl:when test="$class/label[lang($CurrentLang)]">
<xsl:sequence select="$class/label[lang($CurrentLang)]" />
<xsl:when test="$class/label[@xml:lang = $CurrentLang]">
<xsl:sequence select="$class/label[@xml:lang = $CurrentLang]" />
</xsl:when>
<xsl:when test="$class/label[lang($DefaultLang)]">
<xsl:sequence select="$class/label[lang($DefaultLang)]" />
<xsl:when test="$class/label[@xml:lang = $DefaultLang]">
<xsl:sequence select="$class/label[@xml:lang = $DefaultLang]" />
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="$class/label[1]" />
Expand Down
2 changes: 1 addition & 1 deletion mycore-base/src/test/java/org/mycore/frontend/xsl/MCRXSLClassificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void testCategory() throws Exception {
// existing classification: return category with respective labels
assertEquals(1, result.getChildren("category").size());
assertEquals("junit_1", result.getChild("category").getAttributeValue("ID"));
assertEquals(3, result.getChild("category").getChildren("label").size());
assertEquals(4, result.getChild("category").getChildren("label").size());
assertEquals("de",
result.getChild("category").getChildren("label").get(0).getAttributeValue("lang", Namespace.XML_NAMESPACE));
assertEquals("junit_1 (de)",
Expand Down
1 change: 1 addition & 0 deletions mycore-base/src/test/resources/classification/TestClassification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<label xml:lang="de" text="junit_1 (de)"/>
<label xml:lang="en" text="junit_1 (en)"/>
<label xml:lang="x-xxx" text="abc"/>
<label xml:lang="x-xxx-abc" text="def"/>
</category>
<category ID="junit_2">
<label xml:lang="en" text="junit_2 (en)"/>
Expand Down
Loading