[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. fb0366d23241dca92b6346d06b09679317a2a0d7

Evergreen Git git at git.evergreen-ils.org
Thu Jul 10 15:13:42 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  fb0366d23241dca92b6346d06b09679317a2a0d7 (commit)
       via  a1c8c3a7ade8b5f0c93af9832683bb151d3ce77f (commit)
      from  30912a6eb2c87099bae01e13cd85c5381b7b8852 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fb0366d23241dca92b6346d06b09679317a2a0d7
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Apr 15 16:30:19 2014 -0400

    LP#1308239 support holds fulfillment on precat copies
    
    During checkout, allow holds on precat copies to get fulfilled.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
index 4fec8e4..df5f2d4 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Circulate.pm
@@ -1717,8 +1717,8 @@ sub handle_checkout_holds {
    my $e = $self->editor;
    $self->fulfilled_holds([]);
 
-   # pre/non-cats can't fulfill a hold
-   return if $self->is_precat or $self->is_noncat;
+   # non-cats can't fulfill a hold
+   return if $self->is_noncat;
 
     my $hold = $e->search_action_hold_request({   
         current_copy        => $copy->id , 

commit a1c8c3a7ade8b5f0c93af9832683bb151d3ce77f
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Jun 25 09:32:48 2013 -0400

    LP#1308239 Support pre-cat copy hold targeting
    
    Remove an unused line of code in the hold targeter which was preventing
    targeting of pre-cat copies.
    
    In OpenILS::Utils::PermitHold::permit_copy_hold, neither in-db nor
    script based hold viability checks inspect the value of the
    "title_descriptor" field in the provided params.  Remove this field and
    pre-cats just work.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 7cc2086..0452676 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1823,7 +1823,6 @@ sub new_hold_copy_targeter {
                     ) &&
                 ( OpenILS::Utils::PermitHold::permit_copy_hold(
                     { title => $old_best->call_number->record->to_fieldmapper,
-                      title_descriptor => $old_best->call_number->record->record_descriptor->next->to_fieldmapper,
                       patron => $hold->usr->to_fieldmapper,
                       copy => $old_best->to_fieldmapper,
                       requestor => $hold->requestor->to_fieldmapper,
@@ -2260,7 +2259,6 @@ sub choose_nearest_copy {
         while (my ($c) = splice(@capturable, $rand, 1)) {
             return $c if !exists($seen{$c->id}) && ( OpenILS::Utils::PermitHold::permit_copy_hold(
                 { title => $c->call_number->record->to_fieldmapper,
-                  title_descriptor => $c->call_number->record->record_descriptor->next->to_fieldmapper,
                   patron => $hold->usr->to_fieldmapper,
                   copy => $c->to_fieldmapper,
                   requestor => $hold->requestor->to_fieldmapper,

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Circ/Circulate.pm      |    4 ++--
 .../Application/Storage/Publisher/action.pm        |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list