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

[raeburn]

raeburn		Sat Feb 21 21:53:35 2015 EDT

  Modified files:              
    /loncom/homework	inputtags.pm lonhomework.pm 
  Log:
  Bug 6476
    - Fix typo
    - Recording maxtries in same location as other submission data.
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.329 loncom/homework/inputtags.pm:1.330
--- loncom/homework/inputtags.pm:1.329	Mon Dec 22 17:04:03 2014
+++ loncom/homework/inputtags.pm	Sat Feb 21 21:53:34 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.329 2014/12/22 17:04:03 raeburn Exp $
+# $Id: inputtags.pm,v 1.330 2015/02/21 21:53:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1512,7 +1512,8 @@
     $Apache::lonhomework::results{"resource.$id.type"} = $Apache::lonhomework::type;
     $Apache::lonhomework::results{"resource.$id.duedate"} = &Apache::lonnet::EXT("resource.$id.duedate");
     $Apache::lonhomework::results{"resource.$id.hinttries"} = &Apache::lonnet::EXT("resource.$id.hinttries");
-    $Apache::lonhomework::results{"resourse.$id.version"} = &Apache::lonnet::usedversion(); 
+    $Apache::lonhomework::results{"resource.$id.version"} = &Apache::lonnet::usedversion();
+    $Apache::lonhomework::results{"resource.$id.maxtries"} = &Apache::lonnet::EXT("resource.$id.maxtries");
 }
 
 sub find_which_previous {
Index: loncom/homework/lonhomework.pm
diff -u loncom/homework/lonhomework.pm:1.348 loncom/homework/lonhomework.pm:1.349
--- loncom/homework/lonhomework.pm:1.348	Tue Jan 27 08:40:41 2015
+++ loncom/homework/lonhomework.pm	Sat Feb 21 21:53:34 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.348 2015/01/27 08:40:41 droeschl Exp $
+# $Id: lonhomework.pm,v 1.349 2015/02/21 21:53:34 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/)