$lt{'resource'}
@@ -1361,7 +1044,6 @@ sub init_problem_globals {
@Apache::inputtags::importlist = ();
@Apache::inputtags::previous=();
@Apache::inputtags::previous_version=();
- $Apache::inputtags::leniency='';
$Apache::structuretags::printanswer='No';
@Apache::structuretags::whileconds=();
@Apache::structuretags::whilebody=();
@@ -1377,11 +1059,8 @@ sub reset_problem_globals {
undef(%Apache::lonhomework::history);
undef(%Apache::lonhomework::results);
undef($Apache::inputtags::part);
- undef($Apache::inputtags::leniency);
if ($type eq 'Task') {
undef($Apache::inputtags::slot_name);
- } elsif ($type eq 'problem') {
- undef($Apache::lonhomework::rawrndseed);
}
#don't undef this, lonhomework.pm takes care of this, we use this to
#detect if we try to do 2 problems in one file
@@ -1483,13 +1162,13 @@ sub start_problem {
my $resource_due;
my $name= &get_resource_name($parstack,$safeeval);
- my ($result,$form_tag_start,$slot_name,$slot,$probpartlist);
+ my ($result,$form_tag_start,$slot_name,$slot);
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
$target eq 'tex') {
if ($env{'form.markaccess'}) {
my @interval=&Apache::lonnet::EXT("resource.0.interval");
- &Apache::lonnet::set_first_access($interval[1],$interval[0]);
+ &Apache::lonnet::set_first_access($interval[1]);
}
($status,$accessmsg,$slot_name,$slot) =
@@ -1499,18 +1178,9 @@ sub start_problem {
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
|| $target eq 'edit') {
- ($result,$form_tag_start,$probpartlist) =
+ ($result,$form_tag_start) =
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
$name);
- } elsif (($target eq 'grade') && ($Apache::lonhomework::type eq 'randomizetry')) {
- my ($symb)= &Apache::lonnet::whichuser();
- my $navmap = Apache::lonnavmaps::navmap->new();
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symb);
- if (ref($res)) {
- $probpartlist = $res->parts();
- }
- }
}
if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
@@ -1520,20 +1190,7 @@ sub start_problem {
$target eq 'tex') {
#handle rand seed in construction space
- my $rndseed=&setup_rndseed($safeeval,$target,$probpartlist);
- if (($target eq 'grade') && &Apache::response::submitted()) {
- if ($Apache::lonhomework::type eq 'randomizetry') {
- $Apache::lonhomework::results{'resource.0.rndseed'}=$rndseed;
- } else {
- my @parts;
- if (ref($probpartlist) eq 'ARRAY') {
- @parts = @{$probpartlist};
- }
- unless (@parts) {
- $Apache::lonhomework::results{'resource.0.rndseed'}=$Apache::lonhomework::rawrndseed;
- }
- }
- }
+ my $rndseed=&setup_rndseed($safeeval,$target);
my ($symb)=&Apache::lonnet::whichuser();
if ($env{'request.state'} ne "construct" &&
@@ -1741,7 +1398,7 @@ sub end_problem {
my $id = $Apache::inputtags::part;
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
- my @packages = split(/,/,$packages);
+ my @packages = split /,/,$packages;
my $allow_print_points = 0;
foreach my $partial_key (@packages) {
if ($partial_key=~m/^part_0$/) {
@@ -2400,15 +2057,9 @@ sub end_while {
}
$return = &Apache::run::run($code,$safeeval);
}
- if ($error) {
- &Apache::lonxml::error(
- ''
- .&mt('Code ran too long. It ran for more than [_1] seconds.',
- $Apache::lonnet::perlvar{'lonScriptTimeout'})
- .&mt('This occurred while running <while> on line [_1].',
- $line)
- .'
');
- }
+ if ($error) {
+ &Apache::lonxml::error(''.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running <while> on line').' '.$line.'
');
+ }
} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');
}
@@ -2475,8 +2126,8 @@ sub start_randomlist {
}
}
}
- for my $i (0 .. $show) {
- $bodytext .= "$randomlist[ $idx_arr[$i] ]";
+ for(0 .. $show) {
+ $bodytext .= "$randomlist[ $idx_arr[$_] ]";
}
&Apache::lonxml::newparser($parser,\$bodytext);
}
@@ -2581,7 +2232,6 @@ sub start_part {
my $id= &Apache::lonxml::get_id($parstack,$safeeval);
$Apache::inputtags::part=$id;
push(@Apache::inputtags::partlist,$id);
- $Apache::inputtags::leniency='';
@Apache::inputtags::response=();
@Apache::inputtags::previous=();
@Apache::inputtags::previous_version=();
@@ -2591,14 +2241,6 @@ sub start_part {
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
my $newtype=&Apache::lonnet::EXT("resource.$id.type");
if ($newtype) { $Apache::lonhomework::type=$newtype; }
- if ($Apache::lonhomework::type eq 'randomizetry') {
- my $rndseed=&setup_rndseed($safeeval,$target);
- if (($target eq 'grade') && &Apache::response::submitted()) {
- $Apache::lonhomework::results{"resource.$id.rndseed"}=$rndseed;
- }
- } elsif (($target eq 'grade') && &Apache::response::submitted()) {
- $Apache::lonhomework::results{"resource.$id.rndseed"}=$Apache::lonhomework::rawrndseed;
- }
my $in_order_show=&ordered_show_check();
my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
$expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
@@ -2649,7 +2291,7 @@ sub start_part {
}
my $weight = &Apache::lonnet::EXT("resource.$id.weight");
my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
- my @allkeys = split(/,/,$allkeys);
+ my @allkeys = split /,/,$allkeys;
my $allow_print_points = 0;
foreach my $partial_key (@allkeys) {
if ($partial_key=~m/^part_(.*)$/) {
@@ -2747,7 +2389,6 @@ sub end_part {
}
pop @Apache::inputtags::status;
$Apache::inputtags::part='';
- $Apache::inputtags::leniency='';
$Apache::lonhomework::type = $Apache::lonhomework::default_type;
return $result;
}
@@ -2855,7 +2496,7 @@ sub start_problemtype {
['hide','Hide']]
,$token);
$result .=&Apache::edit::checked_arg('When used as type(s):','for',
- [ ['exam','Exam/Quiz Problem'],
+ [ ['exam','Bubblesheet Exam/Quiz Problem'],
['survey','Survey'],
['surveycred','Survey (with credit)'],
['anonsurvey','Anonymous Survey'],