--- loncom/homework/structuretags.pm 2015/04/21 22:48:46 1.512.2.10
+++ loncom/homework/structuretags.pm 2014/09/14 15:21:43 1.520
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.512.2.10 2015/04/21 22:48:46 raeburn Exp $
+# $Id: structuretags.pm,v 1.520 2014/09/14 15:21:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -224,54 +224,9 @@ sub end_tex {
}
sub homework_js {
- my ($postsubmit,$timeout);
- if (($env{'request.course.id'}) && ($env{'request.state'} ne 'construct')) {
- my $crstype;
- if (&Apache::loncommon::course_type() eq 'Community') {
- $crstype = 'community';
- } else {
- if ($env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}) {
- $crstype = 'official';
- } elsif ($env{'course.'.$env{'request.course.id'}.'.internal.textbook'}) {
- $crstype = 'textbook';
- } else {
- $crstype = 'unofficial';
- }
- }
- $postsubmit = $env{'course.'.$env{'request.course.id'}.'.internal.postsubmit'};
- if ($postsubmit eq '') {
- my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
- $postsubmit = $domdefs{'postsubmit'};
- unless ($postsubmit eq 'off') {
- $timeout = $domdefs{$crstype.'postsubtimeout'};
- }
- } elsif ($postsubmit eq '0') {
- $postsubmit = 'off';
- } elsif ($postsubmit eq '1') {
- $postsubmit = 'on';
- $timeout = $env{'course.'.$env{'request.course.id'}.'.internal.postsubtimeout'};
- if ($timeout eq '') {
- my %domdefs = &Apache::lonnet::get_domain_defaults($env{'course.'.$env{'request.course.id'}.'.domain'});
- $timeout = $domdefs{$crstype.'postsubtimeout'};
- }
- }
- if ($timeout eq '') {
- $timeout = 60;
- }
- } else {
- my %domdefs = &Apache::lonnet::get_domain_defaults($env{'request.role.domain'});
- $postsubmit = $domdefs{'postsubmit'};
- unless ($postsubmit eq 'off') {
- $timeout = 60;
- }
- }
- my $jstimeout = 0;
- if ($timeout) {
- $jstimeout = 1000 * $timeout;
- }
return &Apache::loncommon::resize_textarea_js().
&setmode_javascript().
- <<"JS";
+ <<'JS';
\n";
- if ($target eq 'edit') {
- $extra_head .= &Apache::edit::js_update_linknum();
- }
}
}
@@ -603,7 +488,7 @@ sub page_start {
"\t".''."\n";
}
}
- return ($page_start,$form_tag_start,$partlist);
+ return ($page_start,$form_tag_start);
}
#use Time::HiRes();
@@ -634,7 +519,7 @@ sub get_resource_name {
}
sub setup_rndseed {
- my ($safeeval,$target,$probpartlist)=@_;
+ my ($safeeval,$target)=@_;
my ($symb)=&Apache::lonnet::whichuser();
my ($questiontype,$set_safespace,$rndseed);
if ($target eq 'analyze') {
@@ -695,13 +580,7 @@ sub setup_rndseed {
}
unless (($target eq 'analyze') && (defined($rndseed))) {
$rndseed=&Apache::lonnet::rndseed();
- my $partfortries = $Apache::inputtags::part;
- if (ref($probpartlist) eq 'ARRAY') {
- if ((@{$probpartlist} == 1) && ($probpartlist->[0] ne $Apache::inputtags::part)) {
- $partfortries = $probpartlist->[0];
- }
- }
- my $curr_try = $Apache::lonhomework::history{"resource.$partfortries.tries"};
+ my $curr_try = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
$curr_try ++;
}
@@ -709,7 +588,7 @@ sub setup_rndseed {
$rndseed = $1;
}
if ($curr_try) {
- my $reqtries = &Apache::lonnet::EXT("resource.$partfortries.randomizeontries");
+ my $reqtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::part.randomizeontries");
if (($reqtries =~ /^\d+$/) && ($reqtries > 1)) {
my $inc = int(($curr_try-1)/$reqtries);
$rndseed += $inc;
@@ -719,9 +598,6 @@ sub setup_rndseed {
}
}
$set_safespace = 1;
- if ($target eq 'grade') {
- $Apache::lonhomework::rawrndseed = $rndseed;
- }
}
if ($set_safespace) {
if ($safeeval) {
@@ -862,7 +738,7 @@ sub problem_web_to_edit_header {
".&mt("Problem Type:")."