--- loncom/homework/lonhomework.pm	2017/12/22 02:00:39	1.369
+++ loncom/homework/lonhomework.pm	2018/01/31 15:28:28	1.370
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.369 2017/12/22 02:00:39 raeburn Exp $
+# $Id: lonhomework.pm,v 1.370 2018/01/31 15:28:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -213,7 +213,7 @@ sub check_slot_access {
 
     # does it pass normal muster
     my ($status,$datemsg)=&check_access($id,$symb);
-    
+
     my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb);
     if ($useslots ne 'resource' && $useslots ne 'map' 
 	&& $useslots ne 'map_map') {
@@ -409,76 +409,12 @@ sub check_slot_access {
     # used to gain access to it to work on it, until the due date is reached, and the
     # problem then becomes CLOSED.  Therefore return the slotstatus - 
     # (which will be one of: NOT_IN_A_SLOT, RESERVABLE, RESERVABLE_LATER, or NOTRESERVABLE).
+
     if (!defined($slot_name) && (($type eq 'problem') || ($type eq 'tool'))) {
         if ($slotstatus eq 'NOT_IN_A_SLOT') {
             if (!$num_usable_slots) {
-                if ($env{'request.course.id'}) {
-                    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                    unless ($symb) {
-                        ($symb)=&Apache::lonnet::whichuser();
-                    }
-                    $slotstatus = 'NOTRESERVABLE';
-                    my ($reservable_now_order,$reservable_now,$reservable_future_order,
-                        $reservable_future) = 
-                        &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
-                    if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
-                        if (@{$reservable_now_order} > 0) {
-                            if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
-                                $slotstatus = 'RESERVABLE';
-                                $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
-                            } else {
-                                my ($uniqstart,$uniqend,$useslot);
-                                if (ref($consumed_uniq) eq 'ARRAY') {
-                                    ($uniqstart,$uniqend)=@{$consumed_uniq};
-                                }
-                                foreach my $slot (reverse(@{$reservable_now_order})) {
-                                    if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
-                                        my ($new_uniq_start,$new_uniq_end) = ($1,$2);
-                                        next if (!
-                                            ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
-                                            ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
-                                    }
-                                    $useslot = $slot;
-                                    last;
-                                }
-                                if ($useslot) {
-                                    $slotstatus = 'RESERVABLE';
-                                    $datemsg = $reservable_now->{$useslot}{'endreserve'};
-                                }
-                            }
-                        }
-                    }
-                    unless ($slotstatus eq 'RESERVABLE') {
-                        if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
-                            if (@{$reservable_future_order} > 0) {
-                                if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
-                                    $slotstatus = 'RESERVABLE_LATER';
-                                    $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
-                                } else {
-                                    my ($uniqstart,$uniqend,$useslot);
-                                    if (ref($consumed_uniq) eq 'ARRAY') {
-                                        ($uniqstart,$uniqend)=@{$consumed_uniq};
-                                    }
-                                    foreach my $slot (@{$reservable_future_order}) {
-                                        if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
-                                            my ($new_uniq_start,$new_uniq_end) = ($1,$2);
-                                            next if (!
-                                               ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
-                                               ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
-                                        }
-                                        $useslot = $slot;
-                                        last;
-                                    }
-                                    if ($useslot) {
-                                        $slotstatus = 'RESERVABLE_LATER';
-                                        $datemsg = $reservable_future->{$useslot}{'startreserve'};
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
+                ($slotstatus,$datemsg) = &check_reservable_slot($slotstatus,$symb,$now,$checkedin,
+                                                                $consumed_uniq);
             }
         }
         return ($slotstatus,$datemsg);
@@ -514,6 +450,81 @@ sub check_slot_access {
     return ($slotstatus,$datemsg,$slot_name,$returned_slot,$ipused);
 }
 
+sub check_reservable_slot {
+    my ($slotstatus,$symb,$now,$checkedin,$consumed_uniq) = @_;
+    my $datemsg;
+    if ($slotstatus eq 'NOT_IN_A_SLOT') {
+        if ($env{'request.course.id'}) {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            unless ($symb) {
+                ($symb)=&Apache::lonnet::whichuser();
+            }
+            $slotstatus = 'NOTRESERVABLE';
+            my ($reservable_now_order,$reservable_now,$reservable_future_order,
+                $reservable_future) =
+                &Apache::loncommon::get_future_slots($cnum,$cdom,$now,$symb);
+            if ((ref($reservable_now_order) eq 'ARRAY') && (ref($reservable_now) eq 'HASH')) {
+                if (@{$reservable_now_order} > 0) {
+                    if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                        $slotstatus = 'RESERVABLE';
+                        $datemsg = $reservable_now->{$reservable_now_order->[-1]}{'endreserve'};
+                    } else {
+                        my ($uniqstart,$uniqend,$useslot);
+                        if (ref($consumed_uniq) eq 'ARRAY') {
+                            ($uniqstart,$uniqend)=@{$consumed_uniq};
+                        }
+                        foreach my $slot (reverse(@{$reservable_now_order})) {
+                            if ($reservable_now->{$slot}{'uniqueperiod'} =~ /^(\d+)\,(\d+)$/) {
+                                my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                next if (!
+                                    ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                    ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                            }
+                            $useslot = $slot;
+                            last;
+                        }
+                        if ($useslot) {
+                            $slotstatus = 'RESERVABLE';
+                            $datemsg = $reservable_now->{$useslot}{'endreserve'};
+                        }
+                    }
+                }
+            }
+            unless ($slotstatus eq 'RESERVABLE') {
+                if ((ref($reservable_future_order) eq 'ARRAY') && (ref($reservable_future) eq 'HASH')) {
+                    if (@{$reservable_future_order} > 0) {
+                        if ((!$checkedin) || (ref($consumed_uniq) ne 'ARRAY')) {
+                            $slotstatus = 'RESERVABLE_LATER';
+                            $datemsg = $reservable_future->{$reservable_future_order->[0]}{'startreserve'};
+                        } else {
+                            my ($uniqstart,$uniqend,$useslot);
+                            if (ref($consumed_uniq) eq 'ARRAY') {
+                                ($uniqstart,$uniqend)=@{$consumed_uniq};
+                            }
+                            foreach my $slot (@{$reservable_future_order}) {
+                                if ($reservable_future->{$slot}{'uniqueperiod'} =~ /^(\d+),(\d+)$/) {
+                                    my ($new_uniq_start,$new_uniq_end) = ($1,$2);
+                                    next if (!
+                                      ($uniqstart < $new_uniq_start && $uniqend < $new_uniq_start) ||
+                                      ($uniqstart > $new_uniq_end   &&  $uniqend > $new_uniq_end  ));
+                                }
+                                $useslot = $slot;
+                                last;
+                            }
+                            if ($useslot) {
+                                $slotstatus = 'RESERVABLE_LATER';
+                                $datemsg = $reservable_future->{$useslot}{'startreserve'};
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return ($slotstatus,$datemsg);
+}
+
 # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.
 sub check_access {