From d23493b82643c39a3dae6c85e395ceebaf90db0a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 10 Dec 2014 16:15:26 +0100 Subject: [PATCH] Bug 13296: (follow-up) permit grep on AUTHUNIMARC I would prefer not to hide this "stuff". Signed-off-by: Jonathan Druart --- C4/Breeding.pm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/C4/Breeding.pm b/C4/Breeding.pm index d1dbbcb..f870ec6 100644 --- a/C4/Breeding.pm +++ b/C4/Breeding.pm @@ -430,9 +430,8 @@ sub ImportBreedingAuth { my $batch_id = GetZ3950BatchId($filename); my $searchbreeding = $dbh->prepare("select import_record_id from import_auths where control_number=? and authorized_heading=?"); -# $encoding = C4::Context->preference("marcflavour") unless $encoding; - my $marc_type = C4::Context->preference('marcflavour'); - $marc_type .= 'AUTH' if ($marc_type eq 'UNIMARC'); + my $marcflavour = C4::Context->preference('marcflavour'); + my $marc_type = $marcflavour eq 'UNIMARC' ? 'AUTHUNIMARC' : $marcflavour; # fields used for import results my $imported=0; @@ -545,8 +544,8 @@ sub Z3950SearchAuth { my $query; my $nterms=0; - my $marc_type = C4::Context->preference('marcflavour'); - $marc_type .= 'AUTH' if ($marc_type eq 'UNIMARC'); + my $marcflavour = C4::Context->preference('marcflavour'); + my $marc_type = $marcflavour eq 'UNIMARC' ? 'AUTHUNIMARC' : $marcflavour; if ($nameany) { $query .= " \@attr 1=1002 \"$nameany\" "; #Any name (this includes personal, corporate, meeting/conference authors, and author names in subject headings) -- 2.1.0