[open-ils-commits] [GIT] Evergreen ILS branch master updated. c14818bb399ddb2a3bcb94a61fe5070ca12ceb22

[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, master has been updated
       via  c14818bb399ddb2a3bcb94a61fe5070ca12ceb22 (commit)
      from  aa8108f54651e496f7d2f84fdd2945b96cabe902 (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 c14818bb399ddb2a3bcb94a61fe5070ca12ceb22
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Apr 3 16:21:25 2013 -0400

    Ignore canceled holds during alt-queue generation
    
    When zero potential copies exist for a hold, the hold queue stats code
    determines the size and shape of the queue by finding and sorting holds
    that have the same type and target.  This patch forces the code to
    ignore canceled holds when looking for similarly-shaped holds.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
index 8e7e5f7..9ba8272 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Holds.pm
@@ -1378,7 +1378,13 @@ sub retrieve_hold_queue_status_impl {
             ],
             where    => {
                 hold_type => $hold->hold_type,
-                target    => $hold->target
+                target    => $hold->target,
+                capture_time => undef,
+                cancel_time => undef,
+                '-or' => [
+                    {expire_time => undef },
+                    {expire_time => {'>' => 'now'}}
+                ]
            }
         });
     }

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

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Circ/Holds.pm |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS