--- loncom/homework/structuretags.pm 2010/12/20 21:40:55 1.465.2.8
+++ loncom/homework/structuretags.pm 2011/01/13 18:41:48 1.465.2.13
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.465.2.8 2010/12/20 21:40:55 raeburn Exp $
+# $Id: structuretags.pm,v 1.465.2.13 2011/01/13 18:41:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,6 +128,7 @@ sub homework_js {
&setmode_javascript().
<<'JS';
JS
}
@@ -153,49 +154,55 @@ JS
sub setmode_javascript {
return <<"ENDSCRIPT";
ENDSCRIPT
}
sub file_delchk_js {
- my $delfilewarn = &mt('You have indicated you wish to delete some files previously included for submission.').'\\n'.
- &mt('Deleted files will not be graded.').' '.
- &mt('Submit Answer?');
+ my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
+ &mt('Continue submission with these files removed?');
return <<"ENDSCRIPT";
ENDSCRIPT
}
@@ -782,7 +789,6 @@ sub store_aggregates {
} else {
$anoncounter{$symb."\0".$part} = 1;
}
- $anoncounter{$symb."\0".$part} = 1;
my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
if ($needsrelease) {
my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
@@ -890,6 +896,7 @@ sub init_problem_globals {
&Apache::lonhomework::reset_show_problem_status();
$Apache::lonhomework::ignore_response_errors=1;
}
+ @Apache::functionplotresponse::callscripts=();
@Apache::inputtags::responselist = ();
@Apache::inputtags::importlist = ();
@Apache::inputtags::previous=();
@@ -917,6 +924,7 @@ sub reset_problem_globals {
undef($Apache::lonhomework::type);
undef($Apache::lonhomework::scantronmode);
undef($Apache::lonhomework::ignore_response_errors);
+ undef(@Apache::functionplotresponse::callscripts);
&Apache::lonhomework::reset_show_problem_status();
}
@@ -1335,6 +1343,9 @@ sub end_problem {
}
}
}
+ if ($target eq 'web') {
+ $result.=&Apache::functionplotresponse::init_script();
+ }
if ($target eq 'grade') {
&Apache::lonhomework::showhash(%Apache::lonhomework::results);
&finalize_storage();