[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework lonhomework.pm
raeburn
raeburn at source.lon-capa.org
Wed Mar 11 21:26:56 EDT 2015
raeburn Thu Mar 12 01:26:56 2015 EDT
Modified files: (Branch: version_2_11_X)
/loncom/homework lonhomework.pm
Log:
- For 2.11
Backport 1.345, 1.346, 1.349
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.344 loncom/homework/lonhomework.pm:1.344.2.1
--- loncom/homework/lonhomework.pm:1.344 Tue Feb 25 19:31:48 2014
+++ loncom/homework/lonhomework.pm Thu Mar 12 01:26:55 2015
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Homework handler
#
-# $Id: lonhomework.pm,v 1.344 2014/02/25 19:31:48 raeburn Exp $
+# $Id: lonhomework.pm,v 1.344.2.1 2015/03/12 01:26:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -469,7 +469,6 @@
if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' &&
$env{'request.state'} ne 'construct') { $maxtries = '2'; }
- $Apache::lonhomework::results{'resource.'.$id.'.maxtries'}=$maxtries;
if ($maxtries && $tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
# if (correct and show prob status) or excused then CANNOT_ANSWER
if ( ($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/)
@@ -541,7 +540,7 @@
} else {
$date = $due_date;
}
- return $date
+ return $date;
}
sub seconds_to_human_length {
@@ -590,7 +589,7 @@
sub showhashsubset {
my ($hash,$keyre) = @_;
my $resultkey;
- foreach $resultkey (sort keys %$hash) {
+ foreach $resultkey (sort(keys(%$hash))) {
if ($resultkey !~ /$keyre/) { next; }
if (ref($$hash{$resultkey}) eq 'ARRAY' ) {
&Apache::lonxml::debug("$resultkey ---- ".
More information about the LON-CAPA-cvs
mailing list