Backporting changesets 15137 and 15234 for booking

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@15313 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm b/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
index dc6ab3b..142fb23 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
@@ -878,7 +878,7 @@ sub capture_reservation {
 
     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
 

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
index 9ac0252..0d1b758 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
@@ -1318,7 +1318,7 @@ sub reservation_targeter {
 
                                $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.'' }