From: Chris Sharp <csharp@georgialibraries.org>
Date: Tue, 5 Jun 2018 01:56:33 +0000 (-0400)
Subject: LP#1710293 - Complete remaining chunk/bundle work
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5a0b61ab15e1773dc2c64d054b1dea7563dc4f9e;p=working%2FEvergreen.git

LP#1710293 - Complete remaining chunk/bundle work

max_chunk_count becomes max_bundle_count
max_chunk_size => 0 becomes max_bundle_count => 1

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm
index 104cf71fc5..c2e212d159 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Acq/Order.pm
@@ -1455,7 +1455,7 @@ __PACKAGE__->register_method(
     method   => 'upload_records',
     api_name => 'open-ils.acq.process_upload_records',
     stream   => 1,
-    max_chunk_count => 1
+    max_bundle_count => 1
 );
 
 sub upload_records {
@@ -1798,7 +1798,7 @@ __PACKAGE__->register_method(
         ],
         return => {desc => 'Streams a total versus completed counts object, event on error'}
     },
-    max_chunk_count => 1
+    max_bundle_count => 1
 );
 
 sub create_po_assets {
@@ -1855,7 +1855,7 @@ __PACKAGE__->register_method(
         ],
         return => {desc => 'The purchase order id, Event on failure'}
     },
-    max_chunk_count => 1
+    max_bundle_count => 1
 );
 
 sub create_purchase_order_api {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/HoldTargeter.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/HoldTargeter.pm
index afca2fcc9e..5be86beef2 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/HoldTargeter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/HoldTargeter.pm
@@ -13,7 +13,7 @@ __PACKAGE__->register_method(
     argc      => 1,
     stream    => 1,
     # Caller is given control over how often to receive responses.
-    max_chunk_size => 0,
+    max_bundle_count => 1,
     signature => {
         desc     => q/Batch or single hold targeter./,
         params   => [
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
index cff8c6ffe3..2e75aa576e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Z3950.pm
@@ -542,7 +542,7 @@ __PACKAGE__->register_method(
     api_name  => 'open-ils.search.z3950.bucket_search_queue',
     stream    => 1,
     # disable opensrf chunking so the caller can receive timely responses
-    max_chunk_size => 0,
+    max_bundle_count => 1,
     signature => {
         desc => q/
             Performs a Z39.50 search for every record in a bucket, using the
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
index 0d5e827700..c6d46a97b5 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/URLVerify.pm
@@ -35,7 +35,7 @@ __PACKAGE__->register_method(
     method => 'verify_session',
     api_name => 'open-ils.url_verify.session.verify',
     stream => 1,
-    max_chunk_size => 0,
+    max_bundle_count => 1,
     signature => {
         desc => q/
             Performs verification on all (or a subset of the) URLs within the requested session.
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index f34c8aeaee..4116887e70 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -242,8 +242,6 @@ sub process_spool {
     my $session_name = shift;
     my $exit_early = shift;
 
-    $client->max_chunk_count($self->{max_bundle_count}) if (!$client->can('max_bundle_count') && $self->{max_bundle_count});
-
     my $e = new_editor(authtoken => $auth, xact => 1);
     return $e->die_event unless $e->checkauth;
 
@@ -832,7 +830,6 @@ __PACKAGE__->register_method(
 
 sub import_queue {
     my($self, $conn, $auth, $q_id, $options) = @_;
-    $conn->max_chunk_count($self->{max_bundle_count}) if (!$conn->can('max_bundle_count') && $self->{max_bundle_count});
 
     my $e = new_editor(authtoken => $auth, xact => 1);
     return $e->die_event unless $e->checkauth;
@@ -993,7 +990,7 @@ sub import_record_list_impl {
         exit_early => $exit_early
     };
 
-    $conn->max_chunk_count(1) if (!$conn->can('max_bundle_size') && $conn->can('max_chunk_size') && $$args{report_all});
+    $conn->max_bundle_count(1) if ($$args{report_all});
 
     my $auto_overlay_exact = $$args{auto_overlay_exact};
     my $auto_overlay_1match = $$args{auto_overlay_1match};