[open-ils-commits] [GIT] Evergreen ILS branch rel_2_6 updated. 1236a410d2469f16823bead68edef0d876aec047

[Evergreen Git]

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, rel_2_6 has been updated
       via  1236a410d2469f16823bead68edef0d876aec047 (commit)
      from  17d9722773030996fd344e3ff2100fe7ee143f13 (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 1236a410d2469f16823bead68edef0d876aec047
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue May 20 10:09:08 2014 -0700

    LP#1296937: move the $force_bc parameter of ->charged_items() to an implementation method
    
    Argubably, the $force_bc parameter of OpenILS::SIP::Patron->charged_items()
    method exists solely as an implementation convenience for the renew-all
    code.  Consequently, this patch removes the $force_bc parameter from the
    public interface for charged_items() and spins it off into a new
    implementation method.
    
    This patch should be applied at the same time that a reversion of
    SIPServer commit c97d64412bc is applied.  Note that a user who upgrades
    SIPServer without upgrading Evergreen to a version that contains this
    patch will end up in a situation where the code that counts active
    loans for the patron information response will fetch the loans using
    $force_bc set to true; this works only by coincidence.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jeff Godin <jgodin at tadl.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
index 7e998f8..69232f1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm
@@ -739,8 +739,15 @@ sub __circ_to_title {
         $e->retrieve_asset_copy($circ->target_copy) );
 }
 
-# force_bc -- return barcode data regardless of msg64_summary_datatype
 sub charged_items {
+    my ($self, $start, $end, $ids_only) = shift;
+    return $self->charged_items_impl($start, $end, undef, $ids_only);
+}
+
+# implementation method
+# force_bc -- return barcode data regardless of msg64_summary_datatype;
+#             this is used by the renew-all code
+sub charged_items_impl {
     my ($self, $start, $end, $force_bc, $ids_only) = shift;
 
     $self->__patron_items_info();
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
index 675d6ad..ed762a9 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/SIP/Transaction/RenewAll.pm
@@ -31,7 +31,7 @@ sub do_renew_all {
     my $self = shift;
     my $sip = shift;
 
-    my $barcodes = $self->patron->charged_items(undef, undef, 1);
+    my $barcodes = $self->patron->charged_items_impl(undef, undef, 1);
 
     syslog('LOG_INFO', "OILS: RenewalAll for user ".
         $self->patron->{id} ." and items [@$barcodes]");

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

Summary of changes:
 Open-ILS/src/perlmods/lib/OpenILS/SIP/Patron.pm    |    9 ++++++++-
 .../lib/OpenILS/SIP/Transaction/RenewAll.pm        |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS