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

(-)a/Breeding.pm.orig (-4 / +13 lines)
Lines 364-378 sub _add_rowdata { Link Here
364
    $row->{date}//= $row->{date2};
364
    $row->{date}//= $row->{date2};
365
    $row->{isbn}=_isbn_replace($row->{isbn});
365
    $row->{isbn}=_isbn_replace($row->{isbn});
366
366
367
    $row = _add_custom_field_rowdata($row, $record);
367
    $row = _add_custom_field_rowdata(
368
368
            $row, 
369
            $record,  
370
            C4::Context->preference('AdditionalFieldsInZ3950ResultSearch'))
371
        if C4::Context->preference('AdditionalFieldsInZ3950ResultSearch');
369
    return $row;
372
    return $row;
370
}
373
}
371
374
372
sub _add_custom_field_rowdata
375
sub _add_custom_field_rowdata
373
{
376
{
374
    my ( $row, $record ) = @_;
377
    my ( $row, $record, $pref_newtags ) = @_;
375
    my $pref_newtags = C4::Context->preference('AdditionalFieldsInZ3950ResultSearch');
376
    my $pref_flavour = C4::Context->preference('MarcFlavour');
378
    my $pref_flavour = C4::Context->preference('MarcFlavour');
377
379
378
    $pref_newtags =~ s/^\s+|\s+$//g;
380
    $pref_newtags =~ s/^\s+|\s+$//g;
Lines 627-632 sub Z3950SearchAuth { Link Here
627
                            $row_data{heading}      = $heading;
629
                            $row_data{heading}      = $heading;
628
                            $row_data{authid}       = $authid;
630
                            $row_data{authid}       = $authid;
629
                            $row_data{heading_code}      = $heading_authtype_code;
631
                            $row_data{heading_code}      = $heading_authtype_code;
632
                            my $pref_newtags =
633
                                C4::Context->preference('AdditionalFieldsInZ3950ResultAuthSearch');
634
                            if ($pref_newtags) {
635
                                my $row = {};
636
                                $row = _add_custom_field_rowdata($row, $marcrecord, $pref_newtags);
637
                                $row_data{row} = $row;
638
                            }
630
                            push( @breeding_loop, \%row_data );
639
                            push( @breeding_loop, \%row_data );
631
                        }
640
                        }
632
                        else {
641
                        else {
633
   $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('AdditionalFieldsInZ3950ResultAuthSearch', '', 'NULL', 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of an auth search Z3950', 'Free')" );
642
   $dbh->do( "INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('AdditionalFieldsInZ3950ResultAuthSearch', '', 'NULL', 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of an auth search Z3950', 'Free')" );
634
   # Always end with this (adjust the bug info)
643
   # Always end with this (adjust the bug info)
635
   NewVersion( $DBversion, XXXXX, "Description");
644
   NewVersion( $DBversion, XXXXX, "Description");
(-)a/cataloguing.pref.orig (+4 lines)
Lines 264-269 Cataloging: Link Here
264
            - Display the MARC field/subfields
264
            - Display the MARC field/subfields
265
            - pref: AdditionalFieldsInZ3950ResultSearch
265
            - pref: AdditionalFieldsInZ3950ResultSearch
266
            - " in the 'Additional fields' column of Z39.50 search results (use comma as delimiter e.g.: \"<code>001, 082$ab, 090$ab</code>\")"
266
            - " in the 'Additional fields' column of Z39.50 search results (use comma as delimiter e.g.: \"<code>001, 082$ab, 090$ab</code>\")"
267
        -
268
            - Display the MARC field/subfields in Auth Search
269
            - pref: AdditionalFieldsInZ3950ResultAuthSearch
270
            - " in the 'Additional fields' column of Z39.50 auth search results (use comma as delimiter e.g.: \"<code>100, 400</code>\")"
267
        -
271
        -
268
            - When matching on ISSN with the record import tool,
272
            - When matching on ISSN with the record import tool,
269
            - pref: AggressiveMatchOnISSN
273
            - pref: AggressiveMatchOnISSN
(-)a/z3950_auth_search.tt.orig (+15 lines)
Lines 79-84 Link Here
79
        <th>Server</th>
79
        <th>Server</th>
80
        <th>Heading</th>
80
        <th>Heading</th>
81
        <th>Authority Type</th>
81
        <th>Authority Type</th>
82
        [% IF Koha.Preference('AdditionalFieldsInZ3950ResultAuthSearch') != '' %]
83
            <th>Additional Fields</th>
84
        [% END %]
82
        <th>Actions</th>
85
        <th>Actions</th>
83
    </tr></thead>
86
    </tr></thead>
84
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
87
    <tbody>[% FOREACH breeding_loo IN breeding_loop %]
Lines 87-92 Link Here
87
            <td>[% breeding_loo.server | html %]</td>
90
            <td>[% breeding_loo.server | html %]</td>
88
            <td>[% breeding_loo.heading | html %]</td>
91
            <td>[% breeding_loo.heading | html %]</td>
89
            <td>[% breeding_loo.heading_code | html %]</td>
92
            <td>[% breeding_loo.heading_code | html %]</td>
93
            [% IF Koha.Preference('AdditionalFieldsInZ3950ResultAuthSearch') != '' %]
94
                <td>
95
                   <dl>
96
                      [% FOREACH addnumberfield IN breeding_loo.row.addnumberfields %]
97
                        [% FOREACH string IN breeding_loo.row.$addnumberfield %]
98
                            <dt>[% addnumberfield | html %]:</dt>
99
                            <dd>[% string | html %]</dd>
100
                        [% END %]
101
                      [% END %]
102
                   </dl>
103
                </td>
104
            [% END %]
90
            <td class="actions">
105
            <td class="actions">
91
                <div class="btn-group dropup">
106
                <div class="btn-group dropup">
92
                    <a class="btn btn-default btn-xs dropdown-toggle" id="cataloguesearchactions[% breeding_loo.breedingid | html %]" role="button" data-toggle="dropdown" href="#">
107
                    <a class="btn btn-default btn-xs dropdown-toggle" id="cataloguesearchactions[% breeding_loo.breedingid | html %]" role="button" data-toggle="dropdown" href="#">

Return to bug 28166