View | Details | Raw Unified | Return to bug 14377
Collapse All | Expand All

(-)a/C4/XSLT.pm (-3 / +7 lines)
Lines 75-80 sub transformMARCXML4XSLT { Link Here
75
        @fields = $record->fields();
75
        @fields = $record->fields();
76
    };
76
    };
77
    if ($@) { warn "PROBLEM WITH RECORD"; next; }
77
    if ($@) { warn "PROBLEM WITH RECORD"; next; }
78
    my $marcflavour = C4::Context->preference('marcflavour');
78
    my $av = getAuthorisedValues4MARCSubfields($frameworkcode);
79
    my $av = getAuthorisedValues4MARCSubfields($frameworkcode);
79
    foreach my $tag ( keys %$av ) {
80
    foreach my $tag ( keys %$av ) {
80
        foreach my $field ( $record->field( $tag ) ) {
81
        foreach my $field ( $record->field( $tag ) ) {
Lines 82-89 sub transformMARCXML4XSLT { Link Here
82
                my @new_subfields = ();
83
                my @new_subfields = ();
83
                for my $subfield ( $field->subfields() ) {
84
                for my $subfield ( $field->subfields() ) {
84
                    my ( $letter, $value ) = @$subfield;
85
                    my ( $letter, $value ) = @$subfield;
85
                    $value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib )
86
                    # Replace the field value with the authorised value *except* for 942$n ( record supression )
86
                        if $av->{ $tag }->{ $letter };
87
                    if ( $tag ne '942' && $subfield ne 'n' && $marcflavour ne 'UNIMARC' ) {
88
                        $value = GetAuthorisedValueDesc( $tag, $letter, $value, '', $tagslib )
89
                            if $av->{ $tag }->{ $letter };
90
                    }
87
                    push( @new_subfields, $letter, $value );
91
                    push( @new_subfields, $letter, $value );
88
                } 
92
                } 
89
                $field ->replace_with( MARC::Field->new(
93
                $field ->replace_with( MARC::Field->new(
Lines 206-212 sub XSLTParse4Display { Link Here
206
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
210
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
207
                              OPACItemLocation DisplayIconsXSLT
211
                              OPACItemLocation DisplayIconsXSLT
208
                              AlternateHoldingsField AlternateHoldingsSeparator
212
                              AlternateHoldingsField AlternateHoldingsSeparator
209
                              TrackClicks opacthemes IdRef / )
213
                              TrackClicks opacthemes IdRefi OpacSuppression / )
210
    {
214
    {
211
        my $sp = C4::Context->preference( $syspref );
215
        my $sp = C4::Context->preference( $syspref );
212
        next unless defined($sp);
216
        next unless defined($sp);
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-2 / +5 lines)
Lines 27-32 Link Here
27
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
27
        <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
28
        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
28
        <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
29
        <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
29
        <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
30
        <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
30
        <xsl:variable name="TracingQuotesLeft">
31
        <xsl:variable name="TracingQuotesLeft">
31
           <xsl:choose>
32
           <xsl:choose>
32
             <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
33
             <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 91-98 Link Here
91
        </xsl:variable>
92
        </xsl:variable>
92
93
93
        <!-- Indicate if record is suppressed in OPAC -->
94
        <!-- Indicate if record is suppressed in OPAC -->
94
        <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']">
95
        <xsl:if test="$OpacSuppression = 1">
95
            <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span>
96
            <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']">
97
                <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span>
98
            </xsl:if>
96
        </xsl:if>
99
        </xsl:if>
97
100
98
        <!-- Title Statement -->
101
        <!-- Title Statement -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-3 / +5 lines)
Lines 28-33 Link Here
28
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
28
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
29
        <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
29
        <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
30
        <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
30
        <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
31
        <xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
31
        <xsl:variable name="leader" select="marc:leader"/>
32
        <xsl:variable name="leader" select="marc:leader"/>
32
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
33
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
33
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
34
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 282-289 Link Here
282
        </xsl:variable>
283
        </xsl:variable>
283
284
284
        <!-- Indicate if record is suppressed in OPAC -->
285
        <!-- Indicate if record is suppressed in OPAC -->
285
        <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']">
286
        <xsl:if test="$OpacSuppression = 1">
286
            <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span>
287
            <xsl:if test="marc:datafield[@tag=942][marc:subfield[@code='n'] = '1']">
288
                <span class="results_summary suppressed_opac"><xsl:value-of select="concat('#',marc:datafield[@tag=999]/marc:subfield[@code='c'])"/> - Suppressed in OPAC</span>
289
            </xsl:if>
287
        </xsl:if>
290
        </xsl:if>
288
291
289
        <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
292
        <!-- Title Statement: Alternate Graphic Representation (MARC 880) -->
290
- 

Return to bug 14377