Bugzilla – Attachment 50721 Details for
Bug 14377
Indicate that a record is suppressed in staff client
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14377 - Don't replace 942$n with authorised value except when using UNIMARC
Bug-14377---Dont-replace-942n-with-authorised-valu.patch (text/plain), 5.82 KB, created by
Kyle M Hall (khall)
on 2016-04-26 15:11:33 UTC
(
hide
)
Description:
Bug 14377 - Don't replace 942$n with authorised value except when using UNIMARC
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-04-26 15:11:33 UTC
Size:
5.82 KB
patch
obsolete
>From 73f402e4b627e0ed1fd2a52dffb1e497953ac09c Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 18 Apr 2016 17:28:36 +0000 >Subject: [PATCH] Bug 14377 - Don't replace 942$n with authorised value except > when using UNIMARC > >--- > C4/XSLT.pm | 10 +++++++--- > .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 7 +++++-- > .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl | 7 +++++-- > 3 files changed, 17 insertions(+), 7 deletions(-) > >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index dd13c50..1ee5488 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -75,6 +75,7 @@ sub transformMARCXML4XSLT { > @fields = $record->fields(); > }; > if ($@) { warn "PROBLEM WITH RECORD"; next; } >+ my $marcflavour = C4::Context->preference('marcflavour'); > my $av = getAuthorisedValues4MARCSubfields($frameworkcode); > foreach my $tag ( keys %$av ) { > foreach my $field ( $record->field( $tag ) ) { >@@ -82,8 +83,11 @@ sub transformMARCXML4XSLT { > my @new_subfields = (); > for my $subfield ( $field->subfields() ) { > my ( $letter, $value ) = @$subfield; >- $value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib ) >- if $av->{ $tag }->{ $letter }; >+ # Replace the field value with the authorised value *except* for 942$n ( record supression ) >+ if ( $tag ne '942' && $subfield ne 'n' && $marcflavour ne 'UNIMARC' ) { >+ $value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib ) >+ if $av->{ $tag }->{ $letter }; >+ } > push( @new_subfields, $letter, $value ); > } > $field ->replace_with( MARC::Field->new( >@@ -206,7 +210,7 @@ sub XSLTParse4Display { > UseControlNumber IntranetBiblioDefaultView BiblioDefaultView > OPACItemLocation DisplayIconsXSLT > AlternateHoldingsField AlternateHoldingsSeparator >- TrackClicks opacthemes IdRef / ) >+ TrackClicks opacthemes IdRefi OpacSuppression / ) > { > my $sp = C4::Context->preference( $syspref ); > next unless defined($sp); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 873db93..64d7a01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -27,6 +27,7 @@ > <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> > <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/> > <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/> >+ <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/> > <xsl:variable name="TracingQuotesLeft"> > <xsl:choose> > <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when> >@@ -91,8 +92,10 @@ > </xsl:variable> > > <!-- Indicate if record is suppressed in OPAC --> >- <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']"> >- <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span> >+ <xsl:if test="$OpacSuppression = 1"> >+ <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']"> >+ <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span> >+ </xsl:if> > </xsl:if> > > <!-- Title Statement --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >index 2019142..972e484 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >@@ -28,6 +28,7 @@ > <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/> > <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/> > <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/> >+ <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/> > <xsl:variable name="leader" select="marc:leader"/> > <xsl:variable name="leader6" select="substring($leader,7,1)"/> > <xsl:variable name="leader7" select="substring($leader,8,1)"/> >@@ -282,8 +283,10 @@ > </xsl:variable> > > <!-- Indicate if record is suppressed in OPAC --> >- <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']"> >- <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span> >+ <xsl:if test="$OpacSuppression = 1"> >+ <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']"> >+ <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span> >+ </xsl:if> > </xsl:if> > > <!-- Title Statement: Alternate Graphic Representation (MARC 880) --> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14377
:
42424
|
42436
|
42709
|
43026
|
45564
|
45565
|
45566
|
45568
|
46900
|
46993
|
48657
|
48658
|
48659
|
48660
|
48661
|
49718
|
49719
|
49720
|
49721
|
49722
|
50360
|
50361
|
50720
|
50721
|
50839
|
50842
|
50843
|
50844
|
50881
|
50882
|
50883
|
50884
|
50885
|
50987