Attachment 96453 Details for Bug 24267 – Bug 24267: Improve ImportBreedingAuth

[patch] Bug 24267: Improve ImportBreedingAuth

Bug-24267-Improve-ImportBreedingAuth.patch (text/plain), 5.13 KB, created by Nick Clemens (kidclamp) on 2019-12-18 18:27:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2019-12-18 18:27:54 UTC

Size: 5.13 KB

patch

obsolete

>From aa0e7f9205835503897b20b95694721e6ce4f4d7 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 18 Dec 2019 18:27:33 +0000
>Subject: [PATCH] Bug 24267: Improve ImportBreedingAuth
>
>---
> C4/Breeding.pm                            | 63 +++++++------------------------
> Koha/SearchEngine/Elasticsearch/Search.pm |  1 +
> 2 files changed, 15 insertions(+), 49 deletions(-)
>
>diff --git a/C4/Breeding.pm b/C4/Breeding.pm
>index 8f3e4a8c69..59cad532c7 100644
>--- a/C4/Breeding.pm
>+++ b/C4/Breeding.pm
>@@ -485,13 +485,12 @@ sub _translate_query { #SRU query adjusted per server cf. srufields column
> 
> ImportBreedingAuth($marcrecords,$overwrite_auth,$filename,$encoding);
> 
>-    ImportBreedingAuth imports MARC records in the reservoir (import_records table).
>-    ImportBreedingAuth is based on the ImportBreeding subroutine.
>+    ImportBreedingAuth imports MARC records in the reservoir (import_records table) or returns their id if they already exist.
> 
> =cut
> 
> sub ImportBreedingAuth {
>-    my ($marcrecord,$overwrite_auth,$filename,$encoding) = @_;
>+    my ($marcrecord,$filename,$encoding) = @_;
>     my $dbh = C4::Context->dbh;
> 
>     my $batch_id = GetZ3950BatchId($filename);
>@@ -500,56 +499,22 @@ sub ImportBreedingAuth {
>     my $marcflavour = C4::Context->preference('marcflavour');
>     my $marc_type = $marcflavour eq 'UNIMARC' ? 'UNIMARCAUTH' : $marcflavour;
> 
>-    # fields used for import results
>-    my $imported=0;
>-    my $alreadyindb = 0;
>-    my $alreadyinfarm = 0;
>-    my $notmarcrecord = 0;
>-    my $breedingid;
>+    my $heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marcrecord });
> 
>-        # Normalize the record so it doesn't have separated diacritics
>-        SetUTF8Flag($marcrecord);
>-
>-        if (scalar($marcrecord->fields()) == 0) {
>-            $notmarcrecord++;
>-        } else {
>-            my $heading;
>-            $heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marcrecord });
>+    my $heading_authtype_code = GuessAuthTypeCode($marcrecord);
> 
>-            my $heading_authtype_code;
>-            $heading_authtype_code = GuessAuthTypeCode($marcrecord);
>+    my $controlnumber = $marcrecord->field('001')->data;
>+    my $breedingid;
> 
>-            my $controlnumber;
>-            $controlnumber = $marcrecord->field('001')->data;
>+    # Normalize the record so it doesn't have separated diacritics
>+    SetUTF8Flag($marcrecord);
> 
>-            #Check if the authority record already exists in the database...
>-            my ($duplicateauthid,$duplicateauthvalue);
>-            if ($marcrecord && $heading_authtype_code) {
>-                ($duplicateauthid,$duplicateauthvalue) = FindDuplicateAuthority( $marcrecord, $heading_authtype_code);
>-            }
>+    $searchbreeding->execute($controlnumber,$heading);
>+    ($breedingid) = $searchbreeding->fetchrow;
> 
>-            if ($duplicateauthid && $overwrite_auth ne 2) {
>-                #If the authority record exists and $overwrite_auth doesn't equal 2, then mark it as already in the DB
>-                $alreadyindb++;
>-            } else {
>-                if ($controlnumber && $heading) {
>-                    $searchbreeding->execute($controlnumber,$heading);
>-                    ($breedingid) = $searchbreeding->fetchrow;
>-                }
>-                if ($breedingid && $overwrite_auth eq '0') {
>-                    $alreadyinfarm++;
>-                } else {
>-                    if ($breedingid && $overwrite_auth eq '1') {
>-                        ModAuthorityInBatch($breedingid, $marcrecord);
>-                    } else {
>-                        my $import_id = AddAuthToBatch($batch_id, $imported, $marcrecord, $encoding);
>-                        $breedingid = $import_id;
>-                    }
>-                    $imported++;
>-                }
>-            }
>-        }
>-    return ($notmarcrecord,$alreadyindb,$alreadyinfarm,$imported,$breedingid);
>+    return $breedingid if $breedingid;
>+    $breedingid = AddAuthToBatch($batch_id, 0, $marcrecord, $encoding);
>+    return $breedingid;
> }
> 
> =head2 Z3950SearchAuth
>@@ -649,7 +614,7 @@ sub Z3950SearchAuth {
>                             $heading_authtype_code = GuessAuthTypeCode($marcrecord);
>                             $heading = C4::AuthoritiesMarc::GetAuthorizedHeading({ record => $marcrecord });
> 
>-                            my ($notmarcrecord, $alreadyindb, $alreadyinfarm, $imported, $breedingid)= ImportBreedingAuth( $marcrecord, 2, $serverhost[$k], $encoding[$k]);
>+                            my $breedingid = ImportBreedingAuth( $marcrecord, $serverhost[$k], $encoding[$k]);
>                             my %row_data;
>                             $row_data{server}       = $servers[$k]->{'servername'};
>                             $row_data{breedingid}   = $breedingid;
>diff --git a/Koha/SearchEngine/Elasticsearch/Search.pm b/Koha/SearchEngine/Elasticsearch/Search.pm
>index 635d6b5687..afa8904ea9 100644
>--- a/Koha/SearchEngine/Elasticsearch/Search.pm
>+++ b/Koha/SearchEngine/Elasticsearch/Search.pm
>@@ -100,6 +100,7 @@ sub search {
>             body => $query
>         );
>     };
>+#    warn Data::Dumper::Dumper( $query );
>     if ($@) {
>         die $self->process_error($@);
>     }
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24267: 96453 | 96482 | 96496 | 96497 | 96502 | 96503 | 96504 | 96741 | 96742 | 96743