View | Details | Raw Unified | Return to bug 11336
Collapse All | Expand All

(-)a/C4/Reserves.pm (-8 / +20 lines)
Lines 95-100 BEGIN { Link Here
95
        &AddReserve
95
        &AddReserve
96
96
97
        &GetReserve
97
        &GetReserve
98
        &GetOldReserve
98
        &GetReservesFromItemnumber
99
        &GetReservesFromItemnumber
99
        &GetReservesFromBiblionumber
100
        &GetReservesFromBiblionumber
100
        &GetReservesFromBorrowernumber
101
        &GetReservesFromBorrowernumber
Lines 252-258 sub AddReserve { Link Here
252
253
253
    $res = GetReserve( $reserve_id );
254
    $res = GetReserve( $reserve_id );
254
255
255
    Return the current reserve or the old reserve.
256
    Return the current reserve.
256
257
257
=cut
258
=cut
258
259
Lines 263-277 sub GetReserve { Link Here
263
    my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
264
    my $query = "SELECT * FROM reserves WHERE reserve_id = ?";
264
    my $sth = $dbh->prepare( $query );
265
    my $sth = $dbh->prepare( $query );
265
    $sth->execute( $reserve_id );
266
    $sth->execute( $reserve_id );
266
    my $res = $sth->fetchrow_hashref();
267
    return $sth->fetchrow_hashref();
268
}
267
269
268
    unless ( $res ) {
270
=head2 GetOldReserve
269
        $res = $dbh->selectrow_hashref(q|
271
270
            SELECT * FROM old_reserves WHERE reserve_id = ?
272
    $res = GetOldReserve( $reserve_id );
271
        |, {}, $reserve_id);
273
272
    }
274
    Return a old reserve.
275
276
=cut
277
278
sub GetOldReserve {
279
    my ($reserve_id) = @_;
273
280
274
    return $res;
281
    my $dbh = C4::Context->dbh;
282
    return $dbh->selectrow_hashref(q|
283
        SELECT * FROM old_reserves WHERE reserve_id = ?
284
    |, {}, $reserve_id);
275
}
285
}
276
286
277
=head2 GetReservesFromBiblionumber
287
=head2 GetReservesFromBiblionumber
Lines 1618-1623 sub _FixPriority { Link Here
1618
1628
1619
    my $res = GetReserve( $reserve_id );
1629
    my $res = GetReserve( $reserve_id );
1620
1630
1631
    $res = GetOldReserve( $reserve_id ) unless $res;
1632
1621
    if ( $rank eq "del" ) {
1633
    if ( $rank eq "del" ) {
1622
         CancelReserve({ reserve_id => $reserve_id });
1634
         CancelReserve({ reserve_id => $reserve_id });
1623
    }
1635
    }
(-)a/t/db_dependent/Holds.t (-2 / +4 lines)
Lines 6-12 use t::lib::Mocks; Link Here
6
use C4::Context;
6
use C4::Context;
7
use C4::Branch;
7
use C4::Branch;
8
8
9
use Test::More tests => 25;
9
use Test::More tests => 26;
10
use MARC::Record;
10
use MARC::Record;
11
use C4::Biblio;
11
use C4::Biblio;
12
use C4::Items;
12
use C4::Items;
Lines 278-283 ModReserve({ reserve_id => $reserveid2, rank => 'del' }); Link Here
278
$reserve3 = GetReserve( $reserveid3 );
278
$reserve3 = GetReserve( $reserveid3 );
279
is( $reserve3->{priority}, 1, "After ModReserve, the 3rd reserve becomes the first on the waiting list" );
279
is( $reserve3->{priority}, 1, "After ModReserve, the 3rd reserve becomes the first on the waiting list" );
280
280
281
my $oldreserve2 = GetOldReserve( $reserveid2 );
282
is_deeply( $oldreserve2->{reserve_id}, $reserve2->{reserve_id} );
283
281
284
282
# Helper method to set up a Biblio.
285
# Helper method to set up a Biblio.
283
sub create_helper_biblio {
286
sub create_helper_biblio {
284
- 

Return to bug 11336