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

[svn at svn.open-ils.org]

Author: miker
Date: 2010-09-24 13:45:49 -0400 (Fri, 24 Sep 2010)
New Revision: 17956

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
Log:
excise the no-potentials check, should only effect frozen holds

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-09-24 16:40:07 UTC (rev 17955)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Holds.pm	2010-09-24 17:45:49 UTC (rev 17956)
@@ -1033,11 +1033,7 @@
         # fetch cut_in_line and request_time since they're in the order_by
         # and we're asking for distinct values
         select => {ahr => ['id', 'cut_in_line', 'request_time']},
-        from   => {
-            ahr => {
-                ahcm => {type => 'left'} # there may be no copy maps 
-            }
-        },
+        from   => { ahr => 'ahcm' },
         order_by => [
             {
                 "class" => "ahr",
@@ -1050,26 +1046,18 @@
         ],
         distinct => 1,
         where    => {
-            '-or' => [
-                {
-                    '+ahcm' => {
-                        target_copy => {
-                            in => {
-                                select => {ahcm => ['target_copy']},
-                                from   => 'ahcm',
-                                where  => {hold => $hold->id}
-                            } 
+            {
+                '+ahcm' => {
+                    target_copy => {
+                        in => {
+                            select => {ahcm => ['target_copy']},
+                            from   => 'ahcm',
+                            where  => {hold => $hold->id}
                         } 
-                    }
-                },
-                {
-                    '+ahr' => {
-                        hold_type => $hold->hold_type,
-                        target    => $hold->target
-                    }
+                    } 
                 }
-            ]
-        }, 
+            }
+        } 
     });
 
     my $qpos = 1;