Bugzilla – Attachment 52904 Details for
Bug 16493
acq matching on title and author
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16493 [QA Followup] - Restore title and author match as an option, make it the default
Bug-16493-QA-Followup---Restore-title-and-author-m.patch (text/plain), 2.66 KB, created by
Kyle M Hall (khall)
on 2016-06-27 16:07:29 UTC
(
hide
)
Description:
Bug 16493 [QA Followup] - Restore title and author match as an option, make it the default
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2016-06-27 16:07:29 UTC
Size:
2.66 KB
patch
obsolete
>From 8556c43ad1a82bf0f4dcd2b8d49e5650558389a9 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 8 Jun 2016 10:53:25 +0000 >Subject: [PATCH] Bug 16493 [QA Followup] - Restore title and author match as > an option, make it the default > >--- > acqui/addorderiso2709.pl | 16 +++++++++++----- > .../prog/en/modules/acqui/addorderiso2709.tt | 1 + > 2 files changed, 12 insertions(+), 5 deletions(-) > >diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl >index 3b79e49..4f2637e 100755 >--- a/acqui/addorderiso2709.pl >+++ b/acqui/addorderiso2709.pl >@@ -31,6 +31,7 @@ use C4::Auth; > use C4::Output; > use C4::ImportBatch; > use C4::Matcher; >+use C4::Search qw/FindDuplicate/; > use C4::Acquisition; > use C4::Biblio; > use C4::Items; >@@ -159,13 +160,18 @@ if ($op eq ""){ > # 1st insert the biblio, or find it through matcher > unless ( $biblionumber ) { > if ($matcher_id) { >- my $matcher = C4::Matcher->fetch($matcher_id); >- my @matches = $matcher->get_matches( $marcrecord, my $max_matches = 1 ); >- if ( @matches ) { >- $duplinbatch = $import_batch_id; >- next; >+ if ( $matcher_id eq '_TITLE_AUTHOR_' ) { >+ $duplinbatch = $import_batch_id if FindDuplicate($marcrecord); > } >+ else { >+ my $matcher = C4::Matcher->fetch($matcher_id); >+ my @matches = $matcher->get_matches( $marcrecord, my $max_matches = 1 ); >+ $duplinbatch = $import_batch_id if @matches; >+ } >+ >+ next if $duplinbatch; > } >+ > # add the biblio > my $bibitemnum; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >index 63425a7..acf84e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt >@@ -198,6 +198,7 @@ > <span> > <label for="matcher_id">Matching:</label> > <select name="matcher_id" id="matcher_id"> >+ <option value="_TITLE_AUTHOR_">Title and author</option> > <option value="">Do not look for matching records</option> > [% FOREACH available_matcher IN available_matchers %] > [% IF ( available_matcher.code == current_matcher_code ) %] >-- >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 16493
:
51439
|
51441
|
52181
|
52182
|
52903
|
52904
|
57139
|
57140
|
57198
|
57199