Attachment 34532 Details for Bug 13296 – [PASSED QA] Bug 13296: (follow-up) permit grep on AUTHUNIMARC

[patch] [PASSED QA] Bug 13296: (follow-up) permit grep on AUTHUNIMARC

PASSED-QA-Bug-13296-follow-up-permit-grep-on-AUTHU.patch (text/plain), 1.73 KB, created by Katrin Fischer on 2014-12-19 12:19:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2014-12-19 12:19:53 UTC

Size: 1.73 KB

patch

obsolete

>From 14793672227a332f04d26a3233f14f1b3170492f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Wed, 10 Dec 2014 16:15:26 +0100
>Subject: [PATCH] [PASSED QA] Bug 13296: (follow-up) permit grep on
> AUTHUNIMARC
>
>I would prefer not to hide this "stuff".
>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
>---
> C4/Breeding.pm |    9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index d1dbbcb..7bd95fb 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' ? 'UNIMARCAUTH' : $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' ? 'UNIMARCAUTH' : $marcflavour;
> 
>     if ($nameany) {
>         $query .= " \@attr 1=1002 \"$nameany\" "; #Any name (this includes personal, corporate, meeting/conference authors, and author names in subject headings)
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13296: 33675 | 34281 | 34282 | 34283 | 34531 | 34532