[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm

[albertel]

albertel		Thu May 25 15:37:51 2006 EDT

  Modified files:              
    /loncom/homework	bridgetask.pm 
  Log:
  - corrected handling of detection of whether a queue entry is ready to be graded
  
  
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.153 loncom/homework/bridgetask.pm:1.154
--- loncom/homework/bridgetask.pm:1.153	Tue May 23 15:55:40 2006
+++ loncom/homework/bridgetask.pm	Thu May 25 15:37:47 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: bridgetask.pm,v 1.153 2006/05/23 19:55:40 albertel Exp $
+# $Id: bridgetask.pm,v 1.154 2006/05/25 19:37:47 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1394,20 +1394,23 @@
 	}
 	my $end_time;
 	if (my $slot=&slotted_access($queuedata->{$key})) {
+	    &Apache::lonxml::debug("looking at slot $slot");
 	    my %slot_data=&Apache::lonnet::get_slot($slot);
 	    if ($slot_data{'endtime'} < time) { 
 		$end_time = $slot_data{'endtime'};
+	    } else {
+		&Apache::lonxml::debug("not time ".$slot_data{'endtime'});
+		next;
 	    }
 	} else {
 	    my $due_date = &Apache::lonhomework::due_date('0',$symb);
-	    if ($due_date > time) {
+	    if ($due_date < time) {
 		$end_time = $due_date;
+	    } else {
+		&Apache::lonxml::debug("not time $due_date");
+		next;
 	    }
 	}
-	if ($end_time ne '') {
-	    &Apache::lonxml::debug("not time");
-	    next;
-	}
 	
 	if (exists($queuedata->{"$key\0locked"})) {
 	    &Apache::lonxml::debug("someone already has um.");