[open-ils-commits] r17529 - trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-09-08 18:34:16 -0400 (Wed, 08 Sep 2010)
New Revision: 17529

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
Log:
Check for empty-ok after testing issuance copies in addition to when there are no copies to test

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-09-08 20:53:32 UTC (rev 17528)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-09-08 22:34:16 UTC (rev 17529)
@@ -2074,8 +2074,9 @@
 
     $logger->info("issuance possible found ".scalar(@$copies)." potential copies");
 
+    my $empty_ok;
     if (!@$copies) {
-        my $empty_ok = $e->retrieve_config_global_flag('circ.holds.empty_issuance_ok');
+        $empty_ok = $e->retrieve_config_global_flag('circ.holds.empty_issuance_ok');
         $empty_ok = ($empty_ok and $U->is_true($empty_ok->enabled));
 
         return (
@@ -2166,6 +2167,14 @@
       }
     }
 
+    if (!$status[0]) {
+        if (!defined($empty_ok)) {
+            $empty_ok = $e->retrieve_config_global_flag('circ.holds.empty_issuance_ok');
+            $empty_ok = ($empty_ok and $U->is_true($empty_ok->enabled));
+        }
+
+        return (1,0) if ($empty_ok);
+    }
     return @status;
 }