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

(-)a/authorities/blinddetail-biblio-search.pl (-2 / +16 lines)
Lines 59-64 my $index = $query->param('index'); Link Here
59
my $tagid        = $query->param('tagid');
59
my $tagid        = $query->param('tagid');
60
my $relationship = $query->param('relationship');
60
my $relationship = $query->param('relationship');
61
61
62
my $marcflavour  = C4::Context->preference("marcflavour");
63
62
# open template
64
# open template
63
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
65
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
64
    {
66
    {
Lines 89-95 if ($authid) { Link Here
89
    # Get all values for each distinct subfield and add to subfield loop
91
    # Get all values for each distinct subfield and add to subfield loop
90
    my %done_subfields;
92
    my %done_subfields;
91
    for ( $field->subfields ) {
93
    for ( $field->subfields ) {
92
        next if $_->[0] eq '9'; # $9 will be set with authid value
94
        next if $_->[0] eq '3'; # $3 will be set with authid value (UNIMARC)
95
        next if $_->[0] eq '9'; # $9 will be set with authid value (MARC21)
93
        my $letter = $_->[0];
96
        my $letter = $_->[0];
94
        $letter ||= '@';
97
        $letter ||= '@';
95
        next if defined $done_subfields{$letter};
98
        next if defined $done_subfields{$letter};
Lines 98-104 if ($authid) { Link Here
98
        $done_subfields{$letter} = 1;
101
        $done_subfields{$letter} = 1;
99
    }
102
    }
100
103
101
    push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ( $relationship );
104
    # If a relationship code has been selected, add it to the appropriate
105
    # subfield of @subfield_loop, depending on the MARC flavour being used.
106
    if ( $relationship ) {
107
        my $relationship_subfield;
108
        if ( $marcflavour eq 'UNIMARC' ) {
109
            $relationship_subfield = '5';
110
        } elsif ( $marcflavour eq 'MARC21' ) {
111
            $relationship_subfield = 'w';
112
        }
113
        push( @subfield_loop, { marc_subfield => $relationship_subfield, marc_values => $relationship } ) ;
114
    }
102
115
103
    my $controlled_ind = $auth->controlled_indicators({ record => $record, biblio_tag => $tag_number });
116
    my $controlled_ind = $auth->controlled_indicators({ record => $record, biblio_tag => $tag_number });
104
    $indicator1 = $controlled_ind->{ind1};
117
    $indicator1 = $controlled_ind->{ind1};
Lines 115-120 if ($authid) { Link Here
115
128
116
129
117
$template->param(
130
$template->param(
131
    marcflavour     => $marcflavour,
118
    authid          => $authid ? $authid : "",
132
    authid          => $authid ? $authid : "",
119
    index           => $index,
133
    index           => $index,
120
    tagid           => $tagid,
134
    tagid           => $tagid,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt (-3 / +9 lines)
Lines 35-41 Link Here
35
                    [%- FOREACH marc_value IN SUBFIELD_LOO.marc_values -%]
35
                    [%- FOREACH marc_value IN SUBFIELD_LOO.marc_values -%]
36
                        [%- marc_value |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html -%]
36
                        [%- marc_value |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html -%]
37
                    [%- END -%]
37
                    [%- END -%]
38
                [%- END -%]‡9[% authid | html %]";
38
                [%- END -%][% IF ( marcflavour == 'UNIMARC' ) %]‡3[% authid %]";
39
                [% ELSIF ( marcflavour == 'MARC21' ) %]‡9[% authid %]";
40
                [% END %]
39
                [% END %]
41
                [% END %]
40
                RancorReplaceField( new_line, "[% indicator1 | html %]", "[% indicator2 | html %]" );
42
                RancorReplaceField( new_line, "[% indicator1 | html %]", "[% indicator2 | html %]" );
41
            [% ELSE %]
43
            [% ELSE %]
Lines 135-141 Link Here
135
                [% IF ( clear ) %]
137
                [% IF ( clear ) %]
136
                    if (subfield){subfield.value="" ;}
138
                    if (subfield){subfield.value="" ;}
137
                [% ELSE %]
139
                [% ELSE %]
138
                    if(code.value=='9'){
140
                [% IF ( marcflavour == 'UNIMARC' ) %]
141
                    var authid_subfield = "3";
142
                [% ELSIF ( marcflavour == 'MARC21' ) %]
143
                    var authid_subfield = "9";
144
                [% END %]
145
                    if(code.value==authid_subfield){
139
                        subfield.value = "[% authid |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
146
                        subfield.value = "[% authid |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') | html %]";
140
                        break;
147
                        break;
141
                    }
148
                    }
142
- 

Return to bug 21453