--- loncom/homework/inputtags.pm 2010/06/05 01:38:43 1.262
+++ loncom/homework/inputtags.pm 2010/06/17 00:13:20 1.264
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.262 2010/06/05 01:38:43 www Exp $
+# $Id: inputtags.pm,v 1.264 2010/06/17 00:13:20 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -572,8 +572,8 @@ sub valid_award {
'UNIT_NOTNEEDED', 'WANTED_NUMERIC',
'BAD_FORMULA', 'INTERNAL_ERROR', 'SIG_FAIL', 'INCORRECT',
'MISORDERED_RANK', 'INVALID_FILETYPE',
- 'EXCESS_FILESIZE', 'DRAFT',
- 'SUBMITTED', 'SUBMITTED_CREDIT',
+ 'EXCESS_FILESIZE', 'FILENAME_INUSE',
+ 'DRAFT', 'SUBMITTED', 'SUBMITTED_CREDIT',
'ANONYMOUS', 'ANONYMOUS_CREDIT',
'ASSIGNED_SCORE', 'APPROX_ANS',
'EXACT_ANS','COMMA_FAIL') {
@@ -589,7 +589,8 @@ sub valid_award {
'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA', 'INTERNAL_ERROR',
'COMMA_FAIL', 'SIG_FAIL', 'INCORRECT', 'MISORDERED_RANK',
- 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'DRAFT', 'SUBMITTED',
+ 'INVALID_FILETYPE', 'EXCESS_FILESIZE', 'FILENAME_INUSE',
+ 'DRAFT', 'SUBMITTED',
'SUBMITTED_CREDIT', 'ANONYMOUS', 'ANONYMOUS_CREDIT',
'ASSIGNED_SCORE', 'APPROX_ANS', 'EXACT_ANS');
my $i=0;
@@ -820,6 +821,16 @@ sub decideoutput {
$message = &mt('Submission won\'t be graded. The combined size of submitted files exceeded the amount allowed.');
$css_class=$possible_class{'not_charged_try'};
$button=1;
+ } elsif ($award eq 'FILENAME_INUSE') {
+ $message = &mt('You have already uploaded a file with that filename.');
+ if ($target eq 'tex') {
+ $message.= "\\\\\n";
+ } else {
+ $message .= '
';
+ }
+ $message .= &mt('Please use a different file name.');
+ $css_class=$possible_class{'not_charged_try'};
+ $button=1;
} elsif ($award eq 'INVALID_FILETYPE') {
$message = &mt("Submission won't be graded. The type of file submitted is not allowed.");
$css_class=$possible_class{'not_charged_try'};
@@ -1255,15 +1266,7 @@ sub get_grade_messages {
if ( $tries eq '' ) { $tries = '0'; }
if ( $maxtries eq '' ) { $maxtries = '2'; }
if ( $maxtries eq 'con_lost' ) { $maxtries = '0'; }
- my $tries_text=&mt('Tries');
- if ( $Apache::lonhomework::type eq 'survey' ||
- $Apache::lonhomework::type eq 'surveycred' ||
- $Apache::lonhomework::type eq 'anonsurvey' ||
- $Apache::lonhomework::type eq 'anonsurveycred' ||
- $Apache::lonhomework::parsing_a_task) {
- $tries_text=&mt('Submissions');
- }
-
+ my $tries_text= &get_tries_text();;
if ($showbutton) {
if ($target eq 'tex') {
if ($env{'request.state'} ne "construct"
@@ -1275,7 +1278,7 @@ sub get_grade_messages {
$trystr = '\vskip 0 mm ';
}
} else {
- $trystr = '