-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MIR-1241 Response mir facets should be dynamic (#901)
* MIR-1241: split the response-mir.xsl file, dynamic facets were split into a separate facets.xsl file; improved usability and customized the code in the mir_results.scss file; added some facets to the solr-config.json file and corresponding messages to messages_*.properties files. * MIR-1241: remove new fields from solr-config.json for SOLR request handler /select, remove some new messages from messages_*.properties * MIR-1241: add facets for classifications * MIR-1241: split the response-mir.xsl file, dynamic facets were split into a separate facets.xsl file; improved usability and customized the code in the mir_results.scss file; added some facets to the solr-config.json file and corresponding messages to messages_*.properties files. * MIR-1241 * MIR-1241: remove unused file facets.xsl * MIR-1241: refactoring: reducing the number of calls to URI-Resolver * MIR-1241: fix redundant condition * MIR-1241: remove variables $MIR.Response.Facet.Prefix.Classification, $classId * MIR-1241 Moved facet related template to response-facets.xsl. Use include via resource: uri * MIR-1241 Simplified code for arbtrary facets * MIR-1241 Parse classification only once * MIR-1241 Support dynamic facet titles, allow to read values from category.top solr field * MIR-1241 Fix $ClassId to 'category.top' * MIR-1241 Renamed variable * MIR-1241 Removed extra handling for mods.genre and worldReadableComplete facets * MIR-1241 Reduce diff in mir_results.scss (removed changes caused by code format) --------- Co-authored-by: Silvio Hermann <[email protected]> Co-authored-by: Oleksiy 'Alex' Levshyn <[email protected]>
- Loading branch information
3 people
authored
Dec 5, 2023
1 parent
178c827
commit eb13e20
Showing
9 changed files
with
263 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,177 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | ||
| xmlns:encoder="xalan://java.net.URLEncoder" | ||
| xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation" | ||
| xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions" | ||
| xmlns:xalan="http://xml.apache.org/xalan" | ||
| xmlns:fn="http://www.w3.org/2005/xpath-functions" | ||
| exclude-result-prefixes="i18n mcrxsl encoder xalan fn"> | ||
|
|
||
| <xsl:param name="CurrentLang"/> | ||
| <xsl:param name="RequestURL"/> | ||
|
|
||
| <xsl:variable name="facetProperties" select="document(concat('property:','MIR.Response.Facet.*'))"/> | ||
|
|
||
| <xsl:template name="facets"> | ||
| <xsl:for-each select="/response/lst[@name='facet_counts']/lst[@name='facet_fields']/*"> | ||
| <xsl:variable name="facet_name" select="self::node()/@name"/> | ||
|
|
||
| <xsl:if test="self::node()[@name=$facet_name]/int"> | ||
| <!-- name of facet --> | ||
| <div class="card {$facet_name}"> | ||
| <div class="card-header" data-toggle="collapse-next"> | ||
| <h3 class="card-title"> | ||
| <xsl:variable name="classification" | ||
| select="document(concat('notnull:classification:metadata:all:children:', $facet_name))"/> | ||
| <xsl:choose> | ||
| <xsl:when test="i18n:exists(concat('mir.response.facet.', $facet_name, '.title'))"> | ||
| <xsl:value-of select="i18n:translate(concat('mir.response.facet.', $facet_name, '.title'))"/> | ||
| </xsl:when> | ||
| <xsl:when test="not($classification/null)"> | ||
| <xsl:variable name="label" select="$classification/mycoreclass/label[@xml:lang=$CurrentLang]/@text"/> | ||
| <xsl:choose> | ||
| <xsl:when test="string-length($label) > 0"> | ||
| <xsl:value-of select="$label"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of select="$facet_name"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:when> | ||
|
|
||
| <xsl:otherwise> | ||
| <xsl:value-of select="$facet_name"/> | ||
| </xsl:otherwise> | ||
|
|
||
| </xsl:choose> | ||
| </h3> | ||
| </div> | ||
|
|
||
| <!-- facet values --> | ||
| <div class="card-body collapse show"> | ||
| <ul class="filter"> | ||
| <xsl:variable name="CategoryClassValues" | ||
| select="concat('MIR.Response.Facet.', $facet_name, '.CategoryClassValues')"/> | ||
| <xsl:apply-templates select="/response/lst[@name='facet_counts']/lst[@name='facet_fields']"> | ||
| <xsl:with-param name="facet_name" select="$facet_name"/> | ||
| <xsl:with-param name="CategoryClassValues" | ||
| select="boolean($facetProperties/properties/entry[@key = $CategoryClassValues])"/> | ||
| </xsl:apply-templates> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| </xsl:if> | ||
| </xsl:for-each> | ||
| </xsl:template> | ||
|
|
||
| <xsl:template match="/response/lst[@name='facet_counts']/lst[@name='facet_fields']"> | ||
| <xsl:param name="CategoryClassValues" select="false()"/> | ||
| <xsl:param name="facet_name"/> | ||
| <xsl:param name="i18nPrefix"/> | ||
|
|
||
| <xsl:for-each select="lst[@name=$facet_name]/int"> | ||
| <xsl:variable name="fqValue"> | ||
| <xsl:choose> | ||
| <xsl:when test="$CategoryClassValues = true()"> | ||
| <xsl:value-of | ||
| select="concat('category.top',':',substring-before(@name,':'),'%5C:',substring-after(@name,':'))"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of select="concat($facet_name,':',@name)"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:variable> | ||
|
|
||
| <xsl:variable name="fqResponseValue"> | ||
| <xsl:choose> | ||
| <xsl:when test="$CategoryClassValues = true()"> | ||
| <xsl:value-of | ||
| select="concat('category.top',':',substring-before(@name,':'),'\:',substring-after(@name,':'))"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of select="concat($facet_name,':',@name)"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:variable> | ||
| <xsl:variable name="fqFragment" select="concat('fq=',$fqValue)"/> | ||
| <xsl:variable name="fqFragmentEncoded" select="concat('fq=',encoder:encode($fqResponseValue, 'UTF-8'))"/> | ||
| <xsl:variable name="queryWithoutStart" select="mcrxsl:regexp($RequestURL, '(&|%26)(start=)[0-9]*', '')"/> | ||
|
|
||
| <xsl:variable name="queryURL"> | ||
| <xsl:choose> | ||
| <xsl:when test="contains($queryWithoutStart, $fqFragment)"> | ||
| <xsl:choose> | ||
| <xsl:when test="not(substring-after($queryWithoutStart, $fqFragment))"> | ||
| <!-- last parameter --> | ||
| <xsl:value-of | ||
| select="substring($queryWithoutStart, 1, string-length($queryWithoutStart) - string-length($fqFragment) - 1)"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of | ||
| select="concat(substring-before($queryWithoutStart, $fqFragment), substring-after($queryWithoutStart, concat($fqFragment,'&')))"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:when> | ||
| <xsl:when test="contains($queryWithoutStart, $fqFragmentEncoded)"> | ||
| <xsl:choose> | ||
| <xsl:when test="not(substring-after($queryWithoutStart, $fqFragmentEncoded))"> | ||
| <!-- last parameter --> | ||
| <xsl:value-of | ||
| select="substring($queryWithoutStart, 1, string-length($queryWithoutStart) - string-length($fqFragmentEncoded) - 1)"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of | ||
| select="concat(substring-before($queryWithoutStart, $fqFragmentEncoded), substring-after($queryWithoutStart, concat($fqFragmentEncoded,'&')))"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:when> | ||
| <xsl:when test="not(contains($queryWithoutStart, '?'))"> | ||
| <xsl:value-of select="concat($queryWithoutStart, '?', $fqFragment)"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of select="concat($queryWithoutStart, '&', $fqFragment)"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:variable> | ||
|
|
||
| <li data-fq="{$fqResponseValue}"> | ||
| <div class="custom-control custom-checkbox" onclick="location.href='{$queryURL}';"> | ||
| <input type="checkbox" class="custom-control-input"> | ||
| <xsl:if test=" | ||
| /response/lst[@name='responseHeader']/lst[@name='params']/str[@name='fq' and text() = $fqResponseValue] | | ||
| /response/lst[@name='responseHeader']/lst[@name='params']/arr[@name='fq']/str[text() = $fqResponseValue]"> | ||
| <xsl:attribute name="checked">true</xsl:attribute> | ||
| </xsl:if> | ||
| </input> | ||
|
|
||
| <label class="custom-control-label"> | ||
| <span class="title"> | ||
| <xsl:choose> | ||
| <xsl:when | ||
| test="$CategoryClassValues = true() and mcrxsl:isCategoryID(substring-before(@name, ':'), substring-after(@name, ':'))"> | ||
| <xsl:value-of | ||
| select="mcrxsl:getDisplayName(substring-before(@name, ':'), substring-after(@name, ':'))"/> | ||
| </xsl:when> | ||
| <xsl:when test="mcrxsl:isCategoryID($facet_name, @name)"> | ||
| <xsl:value-of select="mcrxsl:getDisplayName($facet_name, @name)"/> | ||
| </xsl:when> | ||
| <xsl:when test="i18n:exists(concat('mir.response.facet.' ,$facet_name, '.value.', @name))"> | ||
| <xsl:value-of select="i18n:translate(concat('mir.response.facet.' ,$facet_name, '.value.', @name))" | ||
| disable-output-escaping="yes"/> | ||
| </xsl:when> | ||
| <xsl:otherwise> | ||
| <xsl:value-of select="@name"/> | ||
| </xsl:otherwise> | ||
| </xsl:choose> | ||
| </span> | ||
|
|
||
| <span class="hits"> | ||
| <xsl:value-of select="."/> | ||
| </span> | ||
| </label> | ||
| </div> | ||
| </li> | ||
| </xsl:for-each> | ||
| </xsl:template> | ||
|
|
||
| </xsl:stylesheet> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.