[open-ils-commits] r15313 - in branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application: . Storage/Publisher (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-01-13 14:04:25 -0500 (Wed, 13 Jan 2010)
New Revision: 15313

Modified:
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
   branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
Log:
Backporting changesets 15137 and 15234 for booking

Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm	2010-01-13 16:35:03 UTC (rev 15312)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm	2010-01-13 19:04:25 UTC (rev 15313)
@@ -878,7 +878,7 @@
 
     my $ret = { captured => 1, reservation => $reservation };
 
-    if ($here <> $reservation->pickup_lib) {
+    if ($here != $reservation->pickup_lib) {
         return OpenILS::Event->new('RESERVATION_CAPTURE_FAILED', payload => { captured => 0, fail_cause => 'not-transferable' })
             if (!$U->is_true($type->transferable)); # non-transferable resource
 

Modified: branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2010-01-13 16:35:03 UTC (rev 15312)
+++ branches/rel_1_6/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2010-01-13 19:04:25 UTC (rev 15313)
@@ -1318,7 +1318,7 @@
 
 				$prox_list =
                     map  { $_->[1] }
-                    sort { $a->[0] <> $b->[0] }
+                    sort { $a->[0] <=> $b->[0] }
                     map  {
                         [   actor::org_unit_proximity->search_where(
                                 { from_org => $bresv->pickup_lib.'', to_org => $_=>owner.'' }