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

(-)a/C4/Biblio.pm (-6 / +19 lines)
Lines 435-440 Returns the number of headings changed Link Here
435
sub BiblioAutoLink {
435
sub BiblioAutoLink {
436
    my $record        = shift;
436
    my $record        = shift;
437
    my $frameworkcode = shift;
437
    my $frameworkcode = shift;
438
    my $verbose = shift;
438
    if (!$record) {
439
    if (!$record) {
439
        carp('Undefined record passed to BiblioAutoLink');
440
        carp('Undefined record passed to BiblioAutoLink');
440
        return 0;
441
        return 0;
Lines 452-466 sub BiblioAutoLink { Link Here
452
453
453
    my $linker = $linker_module->new(
454
    my $linker = $linker_module->new(
454
        { 'options' => C4::Context->preference("LinkerOptions") } );
455
        { 'options' => C4::Context->preference("LinkerOptions") } );
455
    my ( $headings_changed, undef ) =
456
    my ( $headings_changed, $results ) =
456
      LinkBibHeadingsToAuthorities( $linker, $record, $frameworkcode, C4::Context->preference("CatalogModuleRelink") || '' );
457
      LinkBibHeadingsToAuthorities( $linker, $record, $frameworkcode, C4::Context->preference("CatalogModuleRelink") || '', $verbose );
457
    # By default we probably don't want to relink things when cataloging
458
    # By default we probably don't want to relink things when cataloging
458
    return $headings_changed;
459
    return $headings_changed, $results;
459
}
460
}
460
461
461
=head2 LinkBibHeadingsToAuthorities
462
=head2 LinkBibHeadingsToAuthorities
462
463
463
  my $num_headings_changed, %results = LinkBibHeadingsToAuthorities($linker, $marc, $frameworkcode, [$allowrelink]);
464
  my $num_headings_changed, %results = LinkBibHeadingsToAuthorities($linker, $marc, $frameworkcode, [$allowrelink, $verbose]);
464
465
465
Links bib headings to authority records by checking
466
Links bib headings to authority records by checking
466
each authority-controlled field in the C<MARC::Record>
467
each authority-controlled field in the C<MARC::Record>
Lines 483-488 sub LinkBibHeadingsToAuthorities { Link Here
483
    my $frameworkcode = shift;
484
    my $frameworkcode = shift;
484
    my $allowrelink = shift;
485
    my $allowrelink = shift;
485
    my $tagtolink     = shift;
486
    my $tagtolink     = shift;
487
    my $verbose = shift;
486
    my %results;
488
    my %results;
487
    if (!$bib) {
489
    if (!$bib) {
488
        carp 'LinkBibHeadingsToAuthorities called on undefined bib record';
490
        carp 'LinkBibHeadingsToAuthorities called on undefined bib record';
Lines 490-496 sub LinkBibHeadingsToAuthorities { Link Here
490
    }
492
    }
491
    require C4::Heading;
493
    require C4::Heading;
492
    require C4::AuthoritiesMarc;
494
    require C4::AuthoritiesMarc;
493
494
    $allowrelink = 1 unless defined $allowrelink;
495
    $allowrelink = 1 unless defined $allowrelink;
495
    my $num_headings_changed = 0;
496
    my $num_headings_changed = 0;
496
    foreach my $field ( $bib->fields() ) {
497
    foreach my $field ( $bib->fields() ) {
Lines 506-511 sub LinkBibHeadingsToAuthorities { Link Here
506
        if ( defined $current_link && (!$allowrelink || !C4::Context->preference('LinkerRelink')) )
507
        if ( defined $current_link && (!$allowrelink || !C4::Context->preference('LinkerRelink')) )
507
        {
508
        {
508
            $results{'linked'}->{ $heading->display_form() }++;
509
            $results{'linked'}->{ $heading->display_form() }++;
510
            push(@{$results{'details'}}, { tag => $field->tag(), authid => $current_link, status => 'UNCHANGED'}) if $verbose;
509
            next;
511
            next;
510
        }
512
        }
511
513
Lines 513-529 sub LinkBibHeadingsToAuthorities { Link Here
513
        if ($authid) {
515
        if ($authid) {
514
            $results{ $fuzzy ? 'fuzzy' : 'linked' }
516
            $results{ $fuzzy ? 'fuzzy' : 'linked' }
515
              ->{ $heading->display_form() }++;
517
              ->{ $heading->display_form() }++;
516
            next if defined $current_link and $current_link == $authid;
518
            if(defined $current_link and $current_link == $authid) {
519
                push(@{$results{'details'}}, { tag => $field->tag(), authid => $current_link, status => 'UNCHANGED'}) if $verbose;
520
                next;
521
            }
517
522
518
            $field->delete_subfield( code => '9' ) if defined $current_link;
523
            $field->delete_subfield( code => '9' ) if defined $current_link;
519
            $field->add_subfields( '9', $authid );
524
            $field->add_subfields( '9', $authid );
520
            $num_headings_changed++;
525
            $num_headings_changed++;
526
            push(@{$results{'details'}}, { tag => $field->tag(), authid => $authid, status => 'LOCAL_FOUND'}) if $verbose;
521
        }
527
        }
522
        else {
528
        else {
529
            my $authority_type = Koha::Authority::Types->find( $heading->auth_type() );
523
            if ( defined $current_link
530
            if ( defined $current_link
524
                && (!$allowrelink || C4::Context->preference('LinkerKeepStale')) )
531
                && (!$allowrelink || C4::Context->preference('LinkerKeepStale')) )
525
            {
532
            {
526
                $results{'fuzzy'}->{ $heading->display_form() }++;
533
                $results{'fuzzy'}->{ $heading->display_form() }++;
534
                push(@{$results{'details'}}, { tag => $field->tag(), authid => $current_link, status => 'UNCHANGED'}) if $verbose;
527
            }
535
            }
528
            elsif ( C4::Context->preference('AutoCreateAuthorities') ) {
536
            elsif ( C4::Context->preference('AutoCreateAuthorities') ) {
529
                if ( _check_valid_auth_link( $current_link, $field ) ) {
537
                if ( _check_valid_auth_link( $current_link, $field ) ) {
Lines 599-622 sub LinkBibHeadingsToAuthorities { Link Here
599
                    $num_headings_changed++;
607
                    $num_headings_changed++;
600
                    $linker->update_cache($heading, $authid);
608
                    $linker->update_cache($heading, $authid);
601
                    $results{'added'}->{ $heading->display_form() }++;
609
                    $results{'added'}->{ $heading->display_form() }++;
610
                    push(@{$results{'details'}}, { tag => $field->tag(), authid => $authid, status => 'CREATED'}) if $verbose;
602
                }
611
                }
603
            }
612
            }
604
            elsif ( defined $current_link ) {
613
            elsif ( defined $current_link ) {
605
                if ( _check_valid_auth_link( $current_link, $field ) ) {
614
                if ( _check_valid_auth_link( $current_link, $field ) ) {
606
                    $results{'linked'}->{ $heading->display_form() }++;
615
                    $results{'linked'}->{ $heading->display_form() }++;
616
                    push(@{$results{'details'}}, { tag => $field->tag(), authid => $authid, status => 'UNCHANGED'}) if $verbose;
607
                }
617
                }
608
                else {
618
                else {
609
                    $field->delete_subfield( code => '9' );
619
                    $field->delete_subfield( code => '9' );
610
                    $num_headings_changed++;
620
                    $num_headings_changed++;
611
                    $results{'unlinked'}->{ $heading->display_form() }++;
621
                    $results{'unlinked'}->{ $heading->display_form() }++;
622
                    push(@{$results{'details'}}, { tag => $field->tag(), authid => undef, status => 'NONE_FOUND', auth_type => $heading->auth_type(), tag_to_report => $authority_type->auth_tag_to_report}) if $verbose;
612
                }
623
                }
613
            }
624
            }
614
            else {
625
            else {
615
                $results{'unlinked'}->{ $heading->display_form() }++;
626
                $results{'unlinked'}->{ $heading->display_form() }++;
627
                push(@{$results{'details'}}, { tag => $field->tag(), authid => undef, status => 'NONE_FOUND', auth_type => $heading->auth_type(), tag_to_report => $authority_type->auth_tag_to_report}) if $verbose;
616
            }
628
            }
617
        }
629
        }
618
630
619
    }
631
    }
632
    push(@{$results{'details'}}, { tag => '', authid => undef, status => 'UNCHANGED'}) unless %results;
620
    return $num_headings_changed, \%results;
633
    return $num_headings_changed, \%results;
621
}
634
}
622
635
(-)a/authorities/authorities.pl (-1 / +4 lines)
Lines 289-294 sub create_input { Link Here
289
289
290
        }
290
        }
291
    }
291
    }
292
    if ($cgi->param('tagreport') && $subfield_data{tag} == $cgi->param('tagreport')) {
293
        $subfield_data{marc_value}{value} = $cgi->param('tag'. $cgi->param('tagbiblio') . 'subfield' . $subfield_data{subfield});
294
    }
292
    $subfield_data{'index_subfield'} = $index_subfield;
295
    $subfield_data{'index_subfield'} = $index_subfield;
293
    return \%subfield_data;
296
    return \%subfield_data;
294
}
297
}
Lines 576-582 my ($template, $loggedinuser, $cookie) Link Here
576
                            flagsrequired => {editauthorities => 1},
579
                            flagsrequired => {editauthorities => 1},
577
                            debug => 1,
580
                            debug => 1,
578
                            });
581
                            });
579
$template->param(nonav   => $nonav,index=>$myindex,authtypecode=>$authtypecode,breedingid=>$breedingid,);
582
$template->param(nonav   => $nonav,index=>$myindex,authtypecode=>$authtypecode,breedingid=>$breedingid);
580
583
581
$tagslib = GetTagsLabels(1,$authtypecode);
584
$tagslib = GetTagsLabels(1,$authtypecode);
582
$mandatory_z3950 = GetMandatoryFieldZ3950($authtypecode);
585
$mandatory_z3950 = GetMandatoryFieldZ3950($authtypecode);
(-)a/cataloguing/z3950_auth_search.pl (+3 lines)
Lines 42-47 my $subjectsubdiv = $input->param('subjectsubdiv'); Link Here
42
my $srchany       = $input->param('srchany');
42
my $srchany       = $input->param('srchany');
43
my $op            = $input->param('op')||'';
43
my $op            = $input->param('op')||'';
44
my $page            = $input->param('current_page') || 1;
44
my $page            = $input->param('current_page') || 1;
45
my $index =$input->param('index');
45
$page = $input->param('goto_page') if $input->param('changepage_goto');
46
$page = $input->param('goto_page') if $input->param('changepage_goto');
46
my $controlnumber    = $input->param('controlnumber');
47
my $controlnumber    = $input->param('controlnumber');
47
48
Lines 65-70 $template->param( Link Here
65
    srchany      => $srchany,
66
    srchany      => $srchany,
66
    authid => $authid,
67
    authid => $authid,
67
    controlnumber => $controlnumber,
68
    controlnumber => $controlnumber,
69
    index => $index,
68
);
70
);
69
71
70
if ( $op ne "do_search" ) {
72
if ( $op ne "do_search" ) {
Lines 74-79 if ( $op ne "do_search" ) { Link Here
74
    $template->param(
76
    $template->param(
75
        serverloop   => $serverloop,
77
        serverloop   => $serverloop,
76
        opsearch     => "search",
78
        opsearch     => "search",
79
        index        => $index,
77
    );
80
    );
78
    output_html_with_http_headers $input, $cookie, $template->output;
81
    output_html_with_http_headers $input, $cookie, $template->output;
79
    exit;
82
    exit;
(-)a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css (+16 lines)
Lines 352-357 tbody tr.active td { Link Here
352
    display: inline-block;
352
    display: inline-block;
353
}
353
}
354
354
355
.matching_authority{
356
    color: #99FF99;
357
}
358
359
.no_matching_authority{
360
    color: #FFAAAA;
361
}
362
363
.matching_authority_field{
364
     background-color: #99FF99 !important;
365
 }
366
367
 .no_matching_authority_field{
368
     background-color: #FFAAAA !important;
369
 }
370
355
@media (min-width: 768px) {
371
@media (min-width: 768px) {
356
    li.subfield_line label {
372
    li.subfield_line label {
357
        width: 20em;
373
        width: 20em;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt (-3 / +4 lines)
Lines 32-39 Link Here
32
		});
32
		});
33
        $("#z3950submit").click(function(){
33
        $("#z3950submit").click(function(){
34
            var strQuery = GetZ3950Terms();
34
            var strQuery = GetZ3950Terms();
35
            var index = "&index=[% index | html %]";
35
            if(strQuery){
36
            if(strQuery){
36
                window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
37
                window.open("/cgi-bin/koha/cataloguing/z3950_auth_search.pl?authid=[% authid | html %]"+strQuery+index,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
37
            }
38
            }
38
            return false;
39
            return false;
39
        });
40
        });
Lines 211-219 function confirmnotdup(redirect){ Link Here
211
    <input type="hidden" name="op" value="add" />
212
    <input type="hidden" name="op" value="add" />
212
    <input type="hidden" name="addfield_field" value="" />
213
    <input type="hidden" name="addfield_field" value="" />
213
    <input type="hidden" name="repeat_field" value="" />
214
    <input type="hidden" name="repeat_field" value="" />
214
    <input type="hidden" name="authtypecode" value="[% authtypecode | html %]" />
215
    <input type="hidden" name="authtypecode" value="[% authtypecode  | html%]" />
215
    <input type="hidden" name="authid" value="[% authid | html %]" />
216
    <input type="hidden" name="authid" value="[% authid | html %]" />
216
    <input type="hidden" name="index" value="[% index | html %]" />
217
    <input type="hidden" name="index" value="[% index | html  %]" />
217
    <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
218
    <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
218
219
219
    <div id="toolbar" class="btn-toolbar">
220
    <div id="toolbar" class="btn-toolbar">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt (-1 / +18 lines)
Lines 44-51 Link Here
44
                var whichfield;
44
                var whichfield;
45
                try {
45
                try {
46
                    whichfield = opener.opener.document.getElementById(index_start);
46
                    whichfield = opener.opener.document.getElementById(index_start);
47
                    autolinker_dialog = opener.opener.document.getElementById("autolinker_dialog");
47
                } catch(e) {
48
                } catch(e) {
48
                    return;
49
                    whichfield = opener.document.getElementById(index_start);
50
                    autolinker_dialog = opener.document.getElementById("autolinker_dialog");
49
                }
51
                }
50
                var field_start = whichfield.parentNode.parentNode.parentNode.parentNode;
52
                var field_start = whichfield.parentNode.parentNode.parentNode.parentNode;
51
53
Lines 138-143 Link Here
138
                    [% ELSE %]
140
                    [% ELSE %]
139
                        if(code.value=='9'){
141
                        if(code.value=='9'){
140
                            subfield.value = "[% To.json(authid) | $raw %]";
142
                            subfield.value = "[% To.json(authid) | $raw %]";
143
                            subfield.className = subfield.className.replace("no_matching_authority_field", "matching_authority_field");
141
                            break;
144
                            break;
142
                        }
145
                        }
143
                    [% END %]
146
                    [% END %]
Lines 145-150 Link Here
145
                }
148
                }
146
            [% END %]
149
            [% END %]
147
150
151
            //Delete create authority button and status
152
            var linkinfos = field_start.getElementsByTagName('i');
153
            for (index = linkinfos.length - 1; index >= 0; index--) {
154
                linkinfos[index].parentNode.removeChild(linkinfos[index]);
155
            }
156
            //Change message autolinker_dialog
157
            var subfield_dialog = $(autolinker_dialog).children('ul').children('li');
158
            for (index = subfield_dialog.length - 1; index >= 0; index--){
159
                var tag_field = field_start.id.split("_")[1];
160
                if (subfield_dialog[index].innerHTML.indexOf(tag_field) !== -1 ){
161
                    subfield_dialog[index].innerHTML = subfield_dialog[index].innerHTML.replace(_("No matching authority found."), _("No matching authority found. A new authority was created or imported"));
162
                    break;
163
                }
164
            }
148
            opener.close();
165
            opener.close();
149
            window.close();
166
            window.close();
150
            return false;
167
            return false;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-1 / +240 lines)
Lines 91-96 Link Here
91
            PopupZ3950();
91
            PopupZ3950();
92
        });
92
        });
93
93
94
        $("#linkerbutton").click(function(){
95
            AutomaticLinker();
96
        });
97
94
        $("#saverecord").click(function(){
98
        $("#saverecord").click(function(){
95
            $(".btn-group").removeClass("open");
99
            $(".btn-group").removeClass("open");
96
            onOption();
100
            onOption();
Lines 177-184 Link Here
177
        var onOption = function () {
181
        var onOption = function () {
178
            return Check();
182
            return Check();
179
        }
183
        }
180
    [% END %]
184
[% END %]
185
186
function confirmnotdup(redirect){
187
    $("#confirm_not_duplicate").attr("value","1");
188
    $("#redirect").attr("value",redirect);
189
    Check();
190
}
191
192
function Dopop(link,i) {
193
    defaultvalue = document.getElementById(i).value;
194
    window.open(link+"&result="+defaultvalue,"valuebuilder",'width=700,height=550,toolbar=false,scrollbars=yes');
195
}
196
197
/**
198
 * this function open a popup to search on z3950 server.
199
 */
200
function PopupZ3950() {
201
    var strQuery = GetZ3950Terms();
202
    if(strQuery){
203
        window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber | html %]"+strQuery,"z3950search",'width=740,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
204
    }
205
}
206
207
/**
208
* this function append button for create new authority if not found
209
*/
210
211
function addCreateAuthorityButton(tag_subfield_line, heading, tag_index) {
212
    var title = _("Create authority");
213
    var elem = $('<a href="#" title="' + title + '"><i class="fa fa-plus-circle"></i></a>');
214
    tag_subfield_line.append(elem);
215
    var tag_subfield_line_a = $('.subfield_line[id^=subfield' + heading.tag + 'a]').eq(tag_index);
216
    var subfield_a = tag_subfield_line_a.children('.input_marceditor').eq(0);
217
    var index = subfield_a.attr('id');
218
    elem.click(function() {
219
        var popup = window.open("", "new_auth_popup",'fullscreen,toolbar=false,scrollbars=yes');
220
        if(popup !== null) {
221
            // Create a new form that will be POSTed in the new window
222
            var form = $('<form>').attr({
223
            method: 'post',
224
            action: "../authorities/authorities.pl",
225
            target: "new_auth_popup"
226
            });
227
            //add the authtypecode
228
            form.append($('<input>').attr({
229
                type: 'hidden',
230
                name: 'authtypecode',
231
                value: heading.auth_type
232
            }));
233
            form.append($('<input>').attr({
234
                type: 'hidden',
235
                name: 'tagreport',
236
                value: heading.tag_to_report
237
            }));
238
            form.append($('<input>').attr({
239
                type: 'hidden',
240
                name: 'tagbiblio',
241
                value: heading.tag
242
            }));
243
            form.append($('<input>').attr({
244
                type: 'hidden',
245
                name: 'index',
246
                value: index
247
            }));
248
            $('.tag[id^=tag_' + heading.tag + '_]').eq(tag_index).find(':input').each(function(){
249
                form.append($('<input>').attr({
250
                    type: 'hidden',
251
                    name: this.name.split('_',4).join(''),
252
                    value: $(this).val()
253
                }));
254
            });
255
256
            $('body').append(form);
257
            form.submit();
258
            form.remove();
259
        }
260
        return false;
261
    });
262
263
}
264
265
/**
266
 * Updates the authid for every heading field
267
 * Adds visual feedback for the changes made on the form.
268
 */
269
function updateHeadingLinks(links) {
270
    var current_tag = '';
271
    var tag_index = 0;
272
273
    // Delete the old message dialog and create a new one
274
    $('#autolinker_dialog').remove();
275
    var message_dialog = $('<div id="autolinker_dialog" class="dialog"><strong>' + _("Automatic authority link results:") + '</strong><ul></ul></div>');
276
    var message_dialog_ul = message_dialog.find('ul');
277
278
    $.each(links, function(index, heading) {
279
        if(current_tag == heading.tag) {
280
            tag_index++;
281
        }
282
        else {
283
            current_tag = heading.tag;
284
            tag_index = 0;
285
        }
286
287
        // Find the $9 field to update
288
        var tag_subfield_line = $('.subfield_line[id^=subfield' + heading.tag + '9]').eq(tag_index);
289
        var subfield = tag_subfield_line.children('.input_marceditor').eq(0);
290
291
        // Delete the old status if one exists
292
        tag_subfield_line.children('.subfield_status').remove();
293
294
        // If the field wasn't modified. Skip it.
295
        if(heading.status == 'UNCHANGED') {
296
            return;
297
        }
298
299
300
        // Make the subfield line visible and update its value
301
        tag_subfield_line.show();
302
        subfield.val(heading.authid);
303
304
        // Add the new status
305
        var image = '<i class="fa fa-close no_matching_authority" </i> ';
306
        var message = '';
307
        var field_class = 'no_matching_authority_field';
308
        switch(heading.status) {
309
            case 'LOCAL_FOUND':
310
                image = '<i class="fa fa-check matching_authority"</i> ';
311
                message = _("A matching authority was found in the local database.");
312
                field_class = 'matching_authority_field';
313
                break;
314
            case 'CREATED':
315
                image = '<i class="fa fa-check matching_authority"></i> ';
316
                message = _("No matching authority found. A new authority was created automatically.");
317
                field_class = 'matching_authority_field';
318
                break;
319
            case 'MULTIPLE_MATCH':
320
                message = _("More than one local match found. Possibly a duplicate authority!");
321
                break;
322
            case 'NONE_FOUND':
323
                message = _("No matching authority found.");
324
                break;
325
            default:
326
                message = heading.status;
327
                break;
328
        }
181
329
330
        subfield[0].classList.add(field_class);
331
        tag_subfield_line.find('i').each(function() {
332
            this.remove();
333
        });
334
        tag_subfield_line.append(image);
335
336
        // Add the message to the dialog
337
        message_dialog_ul.append('<li><strong>' + heading.tag + '</strong> - ' + message + '</li>');
338
339
        // Add a link to create a new authority if none was found
340
        if(heading.status == 'NONE_FOUND' && tag_subfield_line.find('i').length == 1) {
341
            addCreateAuthorityButton(tag_subfield_line, heading , tag_index);
342
        }
343
    });
344
345
    if(message_dialog.find('li').length == 0) {
346
        message_dialog_ul.append("<li>" + _("No authority link was changed.") + "</li>");
347
    }
348
    $('#addbibliotabs').before(message_dialog);
349
}
350
351
/**
352
 * Use an ajax request to automatically find authority links for the current record
353
 */
354
function AutomaticLinker() {
355
    // Show the Loading overlay
356
    $("#loading").show();
357
358
    // Remove fields that are completely empty
359
    $('#f').find('.tag').each(function() {
360
        var empty = true;
361
        $(this).find('.input_marceditor').each(function() {
362
            if($(this).val() != '') {
363
                empty = false;
364
                return false;
365
            }
366
        });
367
        if(empty) {
368
            UnCloneField($(this).attr('id'));
369
        }
370
    });
371
372
    // Get all the form values to post via AJAX
373
    var form_data = {};
374
    $('#f').find(':input').each(function(){
375
        form_data[this.name] = $(this).val();
376
    });
377
    delete form_data[''];
378
379
    // Send the data to automatic_linker.pl
380
    $.ajax({
381
        url:'/cgi-bin/koha/svc/cataloguing/automatic_linker.pl',
382
        type:'post',
383
        data: form_data,
384
        dataType: 'json',
385
        error: function(xhr) {
386
            alert("Error : \n" + xhr.responseText);
387
        },
388
        success: function(json) {
389
            switch(json.status) {
390
                case 'UNAUTHORIZED':
391
                    alert(_("Error : You do not have the permissions necessary to use this functionality."));
392
                    break;
393
                case 'OK':
394
                    updateHeadingLinks(json.links);
395
                    break;
396
            }
397
        },
398
        complete: function() {
399
            $("#loading").hide();
400
        }
401
    });
402
}
403
404
405
function PopupMARCFieldDoc(field) {
406
    [% IF Koha.Preference('marcfielddocurl') %]
407
        var docurl = "[% Koha.Preference('marcfielddocurl').replace('"','&quot;') | html %]";
408
        docurl = docurl.replace("{MARC}", "[% marcflavour | html %]");
409
        docurl = docurl.replace("{FIELD}", ""+field);
410
        docurl = docurl.replace("{LANG}", "[% lang | html %]");
411
        window.open(docurl);
412
    [% ELSIF ( marcflavour == 'MARC21' ) %]
413
        _MARC21FieldDoc(field);
414
    [% ELSIF ( marcflavour == 'UNIMARC' ) %]
415
        _UNIMARCFieldDoc(field);
416
    [% END %]
417
}
182
    function confirmnotdup(redirect){
418
    function confirmnotdup(redirect){
183
        $("#confirm_not_duplicate").attr("value","1");
419
        $("#confirm_not_duplicate").attr("value","1");
184
        $("#redirect").attr("value",redirect);
420
        $("#redirect").attr("value",redirect);
Lines 587-592 Link Here
587
                        [% ELSE %]
823
                        [% ELSE %]
588
                            <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>
824
                            <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>
589
                        [% END %]
825
                        [% END %]
826
                        [% IF ( CAN_user_editauthorities ) %]
827
                            <div class="btn-group"><a class="btn btn-default" href="#" id="linkerbutton"><i class="fa fa-refresh"></i> Link authorities automatically</a></div>
828
                        [% END %]
590
                    [% END %]
829
                    [% END %]
591
830
592
                    <div class="btn-group">
831
                    <div class="btn-group">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt (-1 / +2 lines)
Lines 20-25 Link Here
20
        <form method="post" action="z3950_auth_search.pl" name="f" class="checkboxed">
20
        <form method="post" action="z3950_auth_search.pl" name="f" class="checkboxed">
21
        <input type="hidden" name="op" id="op" value="do_search" />
21
        <input type="hidden" name="op" id="op" value="do_search" />
22
        <input type="hidden" name="authid" value="[% authid | html %]" />
22
        <input type="hidden" name="authid" value="[% authid | html %]" />
23
        <input type="hidden" name="index" value="[% index | html %]" />
23
            <div class="row">
24
            <div class="row">
24
            <div class="col-xs-6">
25
            <div class="col-xs-6">
25
                <fieldset class="rows">
26
                <fieldset class="rows">
Lines 94-100 Link Here
94
                    </a>
95
                    </a>
95
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
96
                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
96
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li>
97
                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewMARC"><i class="fa fa-eye"></i> MARC preview</a></li>
97
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-heading_code="[% breeding_loo.heading_code | html %]" data-authid="[% breeding_loo.authid | html %]"><i class="fa fa-download"></i> Import</a></li>
98
                        <li><a href="#" class="import_record" data-breedingid="[% breeding_loo.breedingid | html %]" data-heading_code="[% breeding_loo.heading_code | html %]" data-authid="[% breeding_loo.authid | html %]" data-index="[% index | html %]" ><i class="fa fa-download"></i> Import</a></li>
98
                    </ul>
99
                    </ul>
99
                </div>
100
                </div>
100
            </td>
101
            </td>
(-)a/koha-tmpl/intranet-tmpl/prog/js/cataloging.js (+5 lines)
Lines 187-192 function CloneField(index, hideMarc, advancedMARCEditor) { Link Here
187
            for( j = 0 ; j < inputs.length ; j++ ) {
187
            for( j = 0 ; j < inputs.length ; j++ ) {
188
                if(inputs[j].getAttribute("id") && inputs[j].getAttribute("id").match(/^tag_/) ){
188
                if(inputs[j].getAttribute("id") && inputs[j].getAttribute("id").match(/^tag_/) ){
189
                    inputs[j].value = "";
189
                    inputs[j].value = "";
190
191
                    //Remove the color added by the automatic linker
192
                    $(inputs[j]).css({backgroundColor:""});
190
                }
193
                }
191
            }
194
            }
192
            var textareas = divs[i].getElementsByTagName('textarea');
195
            var textareas = divs[i].getElementsByTagName('textarea');
Lines 195-200 function CloneField(index, hideMarc, advancedMARCEditor) { Link Here
195
                    textareas[j].value = "";
198
                    textareas[j].value = "";
196
                }
199
                }
197
            }
200
            }
201
            // Remove the status icons added by the automatic linker
202
            $(divs[i]).find('.subfield_status').remove();
198
            if( inputs.length > 0 ){
203
            if( inputs.length > 0 ){
199
                inputs[0].setAttribute('id',inputs[0].getAttribute('id')+new_key);
204
                inputs[0].setAttribute('id',inputs[0].getAttribute('id')+new_key);
200
                inputs[0].setAttribute('name',inputs[0].getAttribute('name')+new_key);
205
                inputs[0].setAttribute('name',inputs[0].getAttribute('name')+new_key);
(-)a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js (-3 / +4 lines)
Lines 1-11 Link Here
1
/* global __ total_pages */
1
/* global __ total_pages */
2
//z3950_search.js for Authorities, Bib records and Acquisitions module
2
//z3950_search.js for Authorities, Bib records and Acquisitions module
3
function Import(Breeding, recordid, AuthType, FrameworkCode) {
3
function Import(Breeding, recordid, AuthType, FrameworkCode, index) {
4
4
5
    if ( AuthType == false ) {
5
    if ( AuthType == false ) {
6
        opener.document.location="../cataloguing/addbiblio.pl?biblionumber="+recordid+"&z3950=1&frameworkcode="+FrameworkCode+"&breedingid="+Breeding;
6
        opener.document.location="../cataloguing/addbiblio.pl?biblionumber="+recordid+"&z3950=1&frameworkcode="+FrameworkCode+"&breedingid="+Breeding;
7
    } else {
7
    } else {
8
        opener.document.location="../authorities/authorities.pl?breedingid="+Breeding+"&authtypecode="+AuthType+"&authid="+recordid;
8
        opener.document.location="../authorities/authorities.pl?breedingid="+Breeding+"&authtypecode="+AuthType+"&authid="+recordid+"&index="+index;
9
    }
9
    }
10
    window.close();
10
    window.close();
11
    return false;
11
    return false;
Lines 141-150 $( document ).ready( function() { Link Here
141
        var data_authid = $( this ).data( "authid" );
141
        var data_authid = $( this ).data( "authid" );
142
        var data_biblionumber = $( this ).data( "biblionumber" );
142
        var data_biblionumber = $( this ).data( "biblionumber" );
143
        var data_frameworkcode = $( this ).data( "frameworkcode" );
143
        var data_frameworkcode = $( this ).data( "frameworkcode" );
144
        var data_index = $( this ).data( "index" );
144
        if ( data_headingcode == undefined ) {
145
        if ( data_headingcode == undefined ) {
145
            Import( data_breedingid, data_biblionumber, false , data_frameworkcode );
146
            Import( data_breedingid, data_biblionumber, false , data_frameworkcode );
146
        } else {
147
        } else {
147
            Import( data_breedingid, data_authid, data_headingcode );
148
            Import( data_breedingid, data_authid, data_headingcode, "", data_index );
148
        }
149
        }
149
        return false;
150
        return false;
150
    });
151
    });
(-)a/svc/cataloguing/automatic_linker.pl (+61 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Bouzid Fergani, 2020   - inLibro
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
use CGI;
22
use CGI::Cookie;
23
use JSON;
24
use C4::Auth;
25
use C4::Biblio;
26
use C4::Context;
27
28
my $input = new CGI;
29
print $input->header('application/json');
30
31
# Check the user's permissions
32
my %cookies = CGI::Cookie->fetch;
33
my $sessid = $cookies{'CGISESSID'}->value || $input->param('CGISESSID');
34
my ( $auth_status, $auth_sessid ) =
35
  C4::Auth::check_cookie_auth( $sessid, { editauthorities => 1, editcatalogue => 1 } );
36
if ( $auth_status ne "ok" ) {
37
    print to_json( { status => 'UNAUTHORIZED' } );
38
    exit 0;
39
}
40
41
# Link the biblio headings to authorities and return a json containing the status of all the links.
42
# Example : {"status":"OK","links":[{"authid":"123","status":"LINK_CHANGED","tag":"650"}]}
43
#
44
# tag = the tag number of the field
45
# authid = the value of the $9 subfield for this tag
46
# status = The status of the link (LOCAL_FOUND, NONE_FOUND, MULTIPLE_MATCH, UNCHANGED, CREATED)
47
48
my $json;
49
50
my $record = TransformHtmlToMarc($input,1);
51
52
my ( $headings_changed, $results ) = BiblioAutoLink (
53
    $record,
54
    $input->param('frameworkcode'),
55
    1
56
);
57
58
$json->{status} = 'OK';
59
$json->{links} = $results->{details} || '';
60
61
print to_json($json);
(-)a/t/Biblio.t (-1 / +1 lines)
Lines 157-160 warnings_like { $ret = UpdateTotalIssues() } Link Here
157
    "UpdateTotalIssues returns carped warnings if biblio record does not exist";
157
    "UpdateTotalIssues returns carped warnings if biblio record does not exist";
158
158
159
ok( !defined $ret, 'UpdateTotalIssues returns carped warning if biblio record does not exist');
159
ok( !defined $ret, 'UpdateTotalIssues returns carped warning if biblio record does not exist');
160
160
1;
(-)a/t/db_dependent/Biblio.t (-3 / +25 lines)
Lines 705-711 subtest 'ModBiblio called from linker test' => sub { Link Here
705
};
705
};
706
706
707
subtest "LinkBibHeadingsToAuthorities record generation tests" => sub {
707
subtest "LinkBibHeadingsToAuthorities record generation tests" => sub {
708
    plan tests => 6;
708
    plan tests => 12;
709
709
710
    # Set up mocks to ensure authorities are generated
710
    # Set up mocks to ensure authorities are generated
711
    my $biblio_mod = Test::MockModule->new( 'C4::Linker::Default' );
711
    my $biblio_mod = Test::MockModule->new( 'C4::Linker::Default' );
Lines 739-744 subtest "LinkBibHeadingsToAuthorities record generation tests" => sub { Link Here
739
        "The generated record contains the correct subfields"
739
        "The generated record contains the correct subfields"
740
    );
740
    );
741
741
742
    #Add test for this case using verbose
743
    my ( $num_headings_changed, $results ) = LinkBibHeadingsToAuthorities($linker, $record, "",undef, 1);
744
    my $details = $results->{details};
745
    is( $num_headings_changed, 1, 'We changed the one we passed' );
746
    is( $results->{details}->[0]->{status}, 'CREATED', "We added an authority record for the heading using verbose");
747
748
    # Now we check the authority record itself
749
    my $authority = GetAuthority($results->{details}->[0]->{authid});
750
751
    is( $authority->field('150')->as_string(),
752
         "Beach city Weirdness Fiction Books 21st Century Fish Stew Pizza",
753
         "The generated record contains the correct subfields when using verbose"
754
    );
755
742
    # Example series link with volume and punctuation
756
    # Example series link with volume and punctuation
743
    $record = MARC::Record->new();
757
    $record = MARC::Record->new();
744
    $field = MARC::Field->new('800','','','a' => 'Tolkien, J. R. R.', 'q' => '(John Ronald Reuel),', 'd' => '1892-1973.', 't' => 'Lord of the rings ;', 'v' => '1');
758
    $field = MARC::Field->new('800','','','a' => 'Tolkien, J. R. R.', 'q' => '(John Ronald Reuel),', 'd' => '1892-1973.', 't' => 'Lord of the rings ;', 'v' => '1');
Lines 759-766 subtest "LinkBibHeadingsToAuthorities record generation tests" => sub { Link Here
759
        "The generated record contains the correct subfields"
773
        "The generated record contains the correct subfields"
760
    );
774
    );
761
775
776
    # The same exemple With verbose
777
    ( $num_headings_changed, $results ) = LinkBibHeadingsToAuthorities($linker, $record, "",undef, 1);
778
    is( $num_headings_changed, 1, 'We changed the one we passed' );
779
    is( $results->{details}->[0]->{status}, 'CREATED', "We added an authority record for the heading using verbose");
762
780
763
781
    # Now we check the authority record itself
782
    my $authority = GetAuthority($results->{details}->[0]->{authid});
783
    is( $authority->field('100')->as_string(),
784
         "Tolkien, J. R. R. (John Ronald Reuel), 1892-1973. Lord of the rings",
785
         "The generated record contains the correct subfields"
786
    );
764
};
787
};
765
788
766
# Cleanup
789
# Cleanup
767
- 

Return to bug 11299