version 1.160, 2003/04/03 14:53:44
|
version 1.165, 2003/04/03 22:25:49
|
Line 104 sub page_start {
|
Line 104 sub page_start {
|
} |
} |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
my ($symb)=&Apache::lonxml::whichuser(); |
my ($symb,undef,undef,undef,$publicuser)= |
if ($symb eq '') { |
&Apache::lonxml::whichuser(); |
|
if ($symb eq '' && !$publicuser) { |
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
$help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />"; |
$help="Browsing resource, all submissions are temporary.<br />"; |
$body_tag_start.=$help; |
$body_tag_start.=$help; |
} |
} |
} |
} |
Line 135 sub get_resource_name {
|
Line 136 sub get_resource_name {
|
sub setup_rndseed { |
sub setup_rndseed { |
my ($safeeval)=@_; |
my ($safeeval)=@_; |
my $rndseed; |
my $rndseed; |
if ($ENV{'request.state'} eq "construct") { |
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($ENV{'request.state'} eq "construct" || $symb eq '') { |
$rndseed=$ENV{'form.rndseed'}; |
$rndseed=$ENV{'form.rndseed'}; |
if (!$rndseed) { |
if (!$rndseed) { |
|
$rndseed=$Apache::lonhomework::history{'rndseed'}; |
|
if (!$rndseed) { |
|
$rndseed=time; |
|
$ENV{'form.rndseed'}=$rndseed; |
|
} |
|
} |
|
if ($ENV{'form.resetdata'} eq 'New Problem Variation') { |
$rndseed=time; |
$rndseed=time; |
$ENV{'form.rndseed'}=$rndseed; |
$ENV{'form.rndseed'}=$rndseed; |
} |
} |
Line 186 sub problem_web_to_edit_header {
|
Line 195 sub problem_web_to_edit_header {
|
|
|
sub initialize_storage { |
sub initialize_storage { |
%Apache::lonhomework::results=(); |
%Apache::lonhomework::results=(); |
|
%Apache::lonhomework::history=(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($ENV{'request.state'} eq 'construct') { |
if ($ENV{'request.state'} eq 'construct' || $symb eq '') { |
%Apache::lonhomework::history= |
%Apache::lonhomework::history= |
&Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); |
&Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name); |
my ($temp)=keys %Apache::lonhomework::history ; |
my ($temp)=keys %Apache::lonhomework::history ; |
Line 210 sub finalize_storage {
|
Line 220 sub finalize_storage {
|
my ($temp) = keys %Apache::lonhomework::results; |
my ($temp) = keys %Apache::lonhomework::results; |
if ( $temp ne '' ) { |
if ( $temp ne '' ) { |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
if ($ENV{'request.state'} eq 'construct') { |
if ($ENV{'request.state'} eq 'construct' || $symb eq '') { |
|
$Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'}; |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results, |
$ENV{'request.uri'},'',$domain,$name); |
$ENV{'request.uri'},'',$domain,$name); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
&Apache::lonxml::debug('Construct Store return message:'.$result); |
Line 251 sub start_problem {
|
Line 262 sub start_problem {
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
return ''; |
return ''; |
} |
} |
#intialize globals |
#initialize globals |
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous_version=(); |
@Apache::inputtags::previous_version=(); |
$Apache::structuretags::printanswer='No'; |
$Apache::structuretags::printanswer='No'; |
|
@Apache::structuretags::whileconds=(); |
|
@Apache::structuretags::whilebody=(); |
|
@Apache::structuretags::whileline=(); |
|
|
if ($target ne 'analyze') { |
if ($target ne 'analyze') { |
&initialize_storage(); |
&initialize_storage(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
Line 265 sub start_problem {
|
Line 280 sub start_problem {
|
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); |
} |
} |
if ($Apache::lonhomework::type eq '') { |
if ($Apache::lonhomework::type eq '' ) { |
my $uri=$ENV{'request.uri'}; |
my $uri=$ENV{'request.uri'}; |
if ($uri=~/\.(\w+)$/) { |
if ($uri=~/\.(\w+)$/) { |
$Apache::lonhomework::type=$1; |
$Apache::lonhomework::type=$1; |
Line 304 sub start_problem {
|
Line 319 sub start_problem {
|
|
|
#handle rand seed in construction space |
#handle rand seed in construction space |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
|
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($ENV{'request.state'} ne "construct" && $symb eq '') { |
|
$form_tag_start.='<input type="hidden" name="rndseed" value="'. |
|
$rndseed.'" />'. |
|
'<input type="submit" name="resetdata" |
|
value="New Problem Variation" />'. |
|
'<input type="hidden" name="username" |
|
value="'.$ENV{'form.username'}.'" />'; |
|
} |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
($status,$accessmsg) = &Apache::lonhomework::check_access('0'); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
Line 582 sub end_block {
|
Line 606 sub end_block {
|
sub start_while { |
sub start_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
&Apache::lonxml::debug('starting while'); |
|
my $result; |
my $result; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
|
|
Line 593 sub start_while {
|
Line 616 sub start_while {
|
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
my $result = &Apache::run::run($code,$safeeval); |
my $result = &Apache::run::run($code,$safeeval); |
my $bodytext=$$parser[-1]->get_text("/while"); |
my $bodytext=&Apache::lonxml::get_all_text("/while",$parser); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
|
push( @Apache::structuretags::whileline, $token->[5]); |
|
&Apache::lonxml::debug("s code $code got -$result-"); |
if ( $result ) { |
if ( $result ) { |
&Apache::lonxml::newparser($parser,\$bodytext); |
&Apache::lonxml::newparser($parser,\$bodytext); |
} |
} |
Line 613 sub start_while {
|
Line 638 sub start_while {
|
|
|
sub end_while { |
sub end_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
&Apache::lonxml::debug('ending while'); |
|
|
|
my $result; |
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
my $code = pop(@Apache::structuretags::whileconds); |
my $code = pop(@Apache::structuretags::whileconds); |
my $bodytext = pop(@Apache::structuretags::whilebody); |
my $bodytext = pop(@Apache::structuretags::whilebody); |
my $result = &Apache::run::run($code,$safeeval); |
my $line = pop(@Apache::structuretags::whileline); |
if ( $result ) { |
my $return = &Apache::run::run($code,$safeeval); |
&Apache::lonxml::newparser($parser,\$bodytext); |
my $starttime=time; |
|
my $error=0; |
|
while ($return) { |
|
if (time-$starttime > |
|
$Apache::lonnet::perlvar{'lonScriptTimeout'}) { |
|
$return = 0; $error=1; next; |
|
} |
|
$result.=&Apache::scripttag::xmlparse($bodytext); |
|
$return = &Apache::run::run($code,$safeeval); |
|
} |
|
if ($error) { |
|
&Apache::lonxml::error('<pre>Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running <while$gt; on line '.$line.'</pre>'); |
} |
} |
} elsif ($target eq "edit") { |
} elsif ($target eq "edit") { |
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |