Skip to content

Commit

Permalink
Indexing / ISO / Properly index all keywords even if in different
Browse files Browse the repository at this point in the history
thesaurus block

Fixes #7841

Use the current-group which contains all grouped blocks.
Also fix record view which in this case was repeating keywords because
the `otherKeywords-` prefix was matching other thesaurus key eg
`otherKeywords-place`.
  • Loading branch information
fxprunayre authored and github-actions[bot] committed May 30, 2024
1 parent 0e50b07 commit 7d15307
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
select="gn-fn-index:build-thesaurus-index-field-name($thesaurusId, $thesaurusTitle)"/>

<xsl:variable name="keywords"
select="mri:keyword[*/normalize-space() != '']"/>
select="current-group()/mri:keyword[*/normalize-space() != '']"/>

<thesaurus>
<info type="{$thesaurusType}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@
select="gn-fn-index:build-thesaurus-index-field-name($thesaurusId, $thesaurusTitle)"/>

<xsl:variable name="keywords"
select="gmd:keyword[*/normalize-space() != '']"/>
select="current-group()/gmd:keyword[*/normalize-space() != '']"/>

<thesaurus>
<info type="{$thesaurusType}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@
thesaurus: "=thesaurus"
},
link: function (scope, element, attrs) {
scope.thesaurus = angular.isArray(scope.thesaurus)
? scope.thesaurus
: [scope.thesaurus];
scope.allKeywords = scope.record && scope.record.allKeywords;
scope.getOrderByConfig = function (thesaurus) {
return thesaurus === "th_regions"
Expand Down

0 comments on commit 7d15307

Please sign in to comment.