version 1.105, 2002/08/23 21:17:16
|
version 1.151, 2003/02/27 20:01:05
|
Line 29
|
Line 29
|
# 6/26/2001 fixed extra web display at end of <web></web> tags |
# 6/26/2001 fixed extra web display at end of <web></web> tags |
# 8/17,8/18,8/20 Gerd Kortemeyer |
# 8/17,8/18,8/20 Gerd Kortemeyer |
|
|
|
|
package Apache::structuretags; |
package Apache::structuretags; |
|
|
use strict; |
use strict; |
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::File(); |
use Apache::File(); |
|
use Apache::lonmenu; |
|
|
BEGIN { |
BEGIN { |
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); |
&Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); |
Line 42 BEGIN {
|
Line 44 BEGIN {
|
|
|
sub start_web { |
sub start_web { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]); |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
if ($target eq 'web') { |
if ($target eq 'web') { |
return $bodytext; |
return $bodytext; |
} |
} |
Line 55 sub end_web {
|
Line 57 sub end_web {
|
|
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $bodytext.' '; |
return $bodytext.' '; |
} |
} |
Line 80 sub page_start {
|
Line 82 sub page_start {
|
if (!defined($found{'html'})) { |
if (!defined($found{'html'})) { |
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, |
$result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, |
$parser,$safeeval); |
$parser,$safeeval); |
$head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target); |
$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target); |
} |
} |
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'})) { |
if (!defined($found{'body'})) { |
$body_tag_start='<body onLoad="'.&Apache::lonxml::loadevents().'" '. |
$body_tag_start='<body onLoad="'.&Apache::lonmenu::loadevents().'" '. |
'onUnload="'.&Apache::lonxml::unloadevents().'" '; |
'onUnload="'.&Apache::lonmenu::unloadevents().'" '; |
my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval); |
my $background=&Apache::lonxml::get_param('background',$parstack,$safeeval); |
if ($background) { |
if ($background) { |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
$Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]= |
Line 99 sub page_start {
|
Line 101 sub page_start {
|
$body_tag_start.='bgcolor="#ffffff"'; |
$body_tag_start.='bgcolor="#ffffff"'; |
} |
} |
} |
} |
$body_tag_start.='>'; |
$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target); |
|
if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { |
|
my ($symb)=&Apache::lonxml::whichuser(); |
|
if ($symb eq '') { |
|
my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference"); |
|
$help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />"; |
|
$body_tag_start.=$help; |
|
} |
|
} |
} |
} |
my $form_tag_start; |
my $form_tag_start; |
if (!defined($found{'form'})) { |
if (!defined($found{'form'})) { |
Line 109 sub page_start {
|
Line 119 sub page_start {
|
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
} |
} |
|
|
|
#use Time::HiRes(); |
sub get_resource_name { |
sub get_resource_name { |
my ($parstack,$safeeval)=@_; |
my ($parstack,$safeeval)=@_; |
my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); |
my $name=&Apache::lonnet::gettitle(); |
if ($name eq '') { |
if ($name eq '') { |
$name=&Apache::lonnet::EXT('resource.title'); |
$name=&Apache::lonnet::EXT('resource.title'); |
if ($name eq 'con_lost') { $name = ''; } |
if ($name eq 'con_lost') { $name = ''; } |
} |
} |
Line 129 sub setup_rndseed {
|
Line 140 sub setup_rndseed {
|
$rndseed=time; |
$rndseed=time; |
$ENV{'form.rndseed'}=$rndseed; |
$ENV{'form.rndseed'}=$rndseed; |
} |
} |
|
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
&Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); |
} |
} |
return $rndseed; |
return $rndseed; |
Line 140 sub problem_edit_header {
|
Line 152 sub problem_edit_header {
|
<input type="submit" name="problemmode" value="Discard Edits and View" /> |
<input type="submit" name="problemmode" value="Discard Edits and View" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
<input type="submit" name="problemmode" value="EditXML" /> |
<input type="submit" name="Undo" value="undo" /> <hr /> |
<input type="submit" name="Undo" value="undo" /> <hr /> |
<input type="submit" name="submit" value="Submit Changes" /> |
<input type="submit" name="submit" value="Submit Changes and Edit" /> |
<input type="submit" name="submit" value="Submit Changes and View" /><br /> |
<input type="submit" name="submit" value="Submit Changes and View" /><br /><p> </p><table border="0"><tr><td bgcolor="#DDDDDD"> |
'; |
'; |
} |
} |
|
|
sub problem_edit_footer { |
sub problem_edit_footer { |
return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" /> |
return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" /> |
<input type="submit" name="submit" value="Submit Changes and View" />'; |
<input type="submit" name="submit" value="Submit Changes and View" />'; |
} |
} |
|
|
Line 161 sub problem_web_to_edit_header {
|
Line 173 sub problem_web_to_edit_header {
|
<input type="submit" name="resetdata" value="Reset Submissions" /> |
<input type="submit" name="resetdata" value="Reset Submissions" /> |
<input type="checkbox" name="showallfoils" '; |
<input type="checkbox" name="showallfoils" '; |
if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } |
if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; } |
$result.= ' /> Show All Foils |
$result.= ' /> Show All Foils |
<hr />'; |
<hr />'; |
|
my $numtoanalyze=$ENV{'form.numtoanalyze'}; |
|
if (!$numtoanalyze) { $numtoanalyze=100; } |
|
$result.= '<input type="submit" name="problemmode" value="Answer Distribution" /> |
|
<input type="text" name="numtoanalyze" value="'. |
|
$numtoanalyze.'" size="5" /> <hr />'; |
|
return $result; |
} |
} |
|
|
sub initialize_storage { |
sub initialize_storage { |
Line 228 sub start_problem {
|
Line 246 sub start_problem {
|
# won't get reset |
# won't get reset |
if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { |
if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { |
&Apache::lonxml::error('Only one problem allowed in a .problem file'); |
&Apache::lonxml::error('Only one problem allowed in a .problem file'); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
return ''; |
return ''; |
} |
} |
#intialize globals |
#intialize globals |
$Apache::inputtags::part='0'; |
$Apache::inputtags::part='0'; |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
|
$Apache::structuretags::printanswer='No'; |
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 284 sub start_problem {
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} |
if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} |
|
|
|
if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); } |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
#handle exam checkout |
#handle exam checkout |
if ($Apache::lonhomework::type eq 'exam') { |
if ($Apache::lonhomework::type eq 'exam') { |
Line 283 sub start_problem {
|
Line 303 sub start_problem {
|
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
|
&Apache::lonxml::debug("Got $status"); |
if (( $status eq 'CLOSED' ) || |
if (( $status eq 'CLOSED' ) || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'UNCHECKEDOUT') || |
( $status eq 'BANNED')) { |
( $status eq 'BANNED') || |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[$#$parser]); |
( $status eq 'UNAVAILABLE')) { |
|
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'; |
$result.= $head_tag_start.'</head>'; |
my $msg=$body_tag_start. |
my $msg=$body_tag_start; |
'<h1>Not open to be viewed</h1>'; |
if ($status eq 'UNAVAILABLE') { |
|
$result.='<h1>Unable to determine if this resource is open due to network problems. Please try again later.</h1>'; |
|
} else { |
|
$result.='<h1>Not open to be viewed</h1>'; |
|
} |
if ($status eq 'CLOSED') { |
if ($status eq 'CLOSED') { |
$msg.='The problem '.$accessmsg; |
$msg.='The problem '.$accessmsg; |
} elsif ($status eq 'UNCHECKEDOUT') { |
} elsif ($status eq 'UNCHECKEDOUT') { |
$msg.=&checkout_msg; |
$msg.=&checkout_msg; |
} |
} |
$result.=$msg.'<br />'; |
$result.=$msg.'<br />'; |
|
} elsif ($target eq 'tex') { |
|
$result.='\begin{document}\noindent \vskip 1 mm \begin{minipage}{\textwidth}\vskip 0 mm'; |
|
if ($status eq 'UNAVAILABLE') { |
|
$result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm '; |
|
} else { |
|
$result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm "; |
|
} |
} |
} |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
my $name= &get_resource_name($parstack,$safeeval); |
my $name= &get_resource_name($parstack,$safeeval); |
Line 316 sub start_problem {
|
Line 349 sub start_problem {
|
} |
} |
} |
} |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' |
|| $status eq 'CLOSED') { |
|| $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') { |
$result.=$head_tag_start. |
$result.=$head_tag_start. |
"<title>$name</title></head>\n$body_tag_start\n"; |
"<title>$name</title></head>\n$body_tag_start\n"; |
} |
} |
Line 328 sub start_problem {
|
Line 361 sub start_problem {
|
} |
} |
$Apache::lonhomework::name=$name; |
$Apache::lonhomework::name=$name; |
my $id = $Apache::inputtags::part; |
my $id = $Apache::inputtags::part; |
|
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
|
my $allkeys = &Apache::lonnet::metadata($ENV{'request.uri'},'keys'); |
|
my @allkeys = split /,/,$allkeys; |
|
my $allow_print_points = 0; |
|
foreach my $partial_key (@allkeys) { |
|
if ($partial_key=~m/weight/) { |
|
$allow_print_points++; |
|
} |
|
} |
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); |
my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); |
$duedate = POSIX::strftime("%c",localtime($duedate)); |
$duedate = POSIX::strftime("%c",localtime($duedate)); |
my $temp_file; |
my $temp_file; |
Line 344 sub start_problem {
|
Line 386 sub start_problem {
|
$temp_file = Apache::File->new('>'.$filename); |
$temp_file = Apache::File->new('>'.$filename); |
print $temp_file "$duedate\n"; |
print $temp_file "$duedate\n"; |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if(not $duedate=~m/1969/) { |
if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { |
$result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm'; |
$result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; |
} else { |
} else { |
$result .= '\begin{document} \noindent \vskip 1 mm'; |
$result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; |
|
if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} |
} |
} else { |
} else { |
$result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; |
$result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; |
} |
} |
} else { |
} else { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
$result .= '\begin{document} \noindent \vskip 1 mm'; |
$result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; |
|
if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
} else { |
} else { |
$result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; |
$result .= '\vskip 1mm \\\\\\\\'; |
} |
} |
} |
} |
} |
} |
Line 379 sub end_problem {
|
Line 423 sub end_problem {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) { |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { |
if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { |
if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && $status eq 'CAN_ANSWER' ) { |
# if part is zero, no <part>s existed, so we need to the grading |
# if part is zero, no <part>s existed, so we need to the grading |
&Apache::inputtags::grade; |
&Apache::inputtags::grade; |
} elsif ( $target eq 'web' && $Apache::inputtags::part eq '0' && |
} elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && |
$status ne 'UNCHECKEDOUT') { |
$status ne 'UNCHECKEDOUT') { |
# if part is zero, no <part>s existed, so we need show the current |
# if part is zero, no <part>s existed, so we need show the current |
# grading status |
# grading status |
$result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); |
my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target); |
|
if ($Apache::lonhomework::type ne 'exam') {$result.= $gradestatus;} |
} |
} |
if ( |
if ( |
($target eq 'web' && ($ENV{'request.state'} ne 'construct')) || |
(($target eq 'web') && ($ENV{'request.state'} ne 'construct')) || |
($target eq 'answer') |
($target eq 'answer') || ($target eq 'tex') |
) { |
) { |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER') { |
$result.="</form></body>\n"; |
if ($target ne 'tex') { |
|
$result.="</form></body>\n"; |
|
} |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || |
} elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || |
$status eq 'UNCHECKEDOUT' ) { |
$status eq 'UNCHECKEDOUT' ) { |
$result.="</body>\n"; |
if ($target ne 'tex') { |
|
$result.="</body>\n"; |
|
} |
|
} |
|
if ($target eq 'web') { |
|
$result.=&Apache::lonxml::xmlend(); |
|
} elsif ($target eq 'tex') { |
|
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
|
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
|
$result .= '\end{minipage}\end{document} '; |
|
} else { |
|
$result .= ''; |
|
} |
} |
} |
$result.=&Apache::lonxml::xmlend(); |
|
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&finalize_storage(); |
&finalize_storage(); |
} |
} |
|
if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) { |
|
$result.='</html>'; #normally we get it from xmlend, but in CSTR |
|
# we always show answer mode too. |
|
} |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
if ($Apache::inputtags::part eq '0') { |
if ($Apache::inputtags::part eq '0') { |
$result=&Apache::response::mandatory_part_meta; |
$result=&Apache::response::mandatory_part_meta; |
Line 412 sub end_problem {
|
Line 474 sub end_problem {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
$result = &problem_edit_footer(); |
$result = &problem_edit_footer(); |
} elsif ($target eq 'tex') { |
|
$result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; |
|
if (not $ENV{'request.symb'} =~ m/\.page_/) { |
|
$result .= '\end{document} '; |
|
} else { |
|
$result .= '} '; |
|
} |
|
} |
} |
return $result; |
return $result; |
} |
} |
|
|
|
|
sub start_library { |
sub start_library { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
my ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
|
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start. |
&problem_edit_header(); |
&problem_edit_header(); |
my $temp=&Apache::edit::insertlist($target,$token); |
my $temp=&Apache::edit::insertlist($target,$token); |
Line 435 sub start_library {
|
Line 493 sub start_library {
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
$result.=&Apache::edit::handle_insert(); |
} elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) { |
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && |
|
$ENV{'request.state'} eq "construct" ) { |
|
($result,$head_tag_start,$body_tag_start,$form_tag_start)= |
|
&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
my $name=&get_resource_name($parstack,$safeeval); |
my $name=&get_resource_name($parstack,$safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
my $rndseed=&setup_rndseed($safeeval); |
$result.="$head_tag_start<title>$name</title></head> |
$result.="$head_tag_start<title>$name</title></head> |
Line 451 sub end_library {
|
Line 512 sub end_library {
|
my $result=''; |
my $result=''; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&problem_edit_footer(); |
$result=&problem_edit_footer(); |
} elsif ($target eq 'web' && $ENV{'request.state'} eq "construct") { |
} elsif ($target eq 'web' && $$tagstack[0] ne 'problem' && |
|
$ENV{'request.state'} eq "construct") { |
$result.='</form></body>'.&Apache::lonxml::xmlend(); |
$result.='</form></body>'.&Apache::lonxml::xmlend(); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub start_block { |
sub start_block { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
|
my $result; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
my $code = @$parstack[$#$parstack]; |
$target eq 'tex' || $target eq 'analyze') { |
$code =~ s/\"//g; |
my $code = @$parstack[$#$parstack]; |
$code .=';return $condition;'; |
if ($code) { |
# print "<br />$code<br />"; |
$code =~ s/\"//g; |
my $result = &Apache::run::run($code,$safeeval); |
$code .=';return $condition;'; |
&Apache::lonxml::debug("block :$code: returned :$result:"); |
if (!$Apache::lonxml::default_homework_loaded) { |
if ( ! $result ) { |
&Apache::lonxml::default_homework_load($safeeval); |
my $skip=&Apache::lonxml::get_all_text("/block",$$parser[$#$parser]); |
} |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[$#$parser]"); |
$result = &Apache::run::run($code,$safeeval); |
|
&Apache::lonxml::debug("block :$code: returned :$result:"); |
|
} else { |
|
$result='1'; |
|
} |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/block",$parser); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
|
} elsif ($target eq 'edit') { |
|
$result .=&Apache::edit::tag_start($target,$token); |
|
$result .=&Apache::edit::text_arg('Test Condition:','condition', |
|
$token,40); |
|
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
|
$safeeval,'condition'); |
|
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
} |
return $result; |
return ""; |
|
} |
} |
|
|
sub end_block { |
sub end_block { |
Line 487 sub start_while {
|
Line 568 sub start_while {
|
$code .=';return $condition;'; |
$code .=';return $condition;'; |
|
|
push( @Apache::structuretags::whileconds, $code); |
push( @Apache::structuretags::whileconds, $code); |
|
if (!$Apache::lonxml::default_homework_loaded) { |
|
&Apache::lonxml::default_homework_load($safeeval); |
|
} |
my $result = &Apache::run::run($code,$safeeval); |
my $result = &Apache::run::run($code,$safeeval); |
my $bodytext=$$parser[$#$parser]->get_text("/while"); |
my $bodytext=$$parser[$#$parser]->get_text("/while"); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
Line 507 sub end_while {
|
Line 591 sub end_while {
|
return ""; |
return ""; |
} |
} |
|
|
# <randomlist> |
# <randomlist show="1"> |
# <tag1>..</tag1> |
# <tag1>..</tag1> |
# <tag2>..</tag2> |
# <tag2>..</tag2> |
# <tag3>..</tag3> |
# <tag3>..</tag3> |
Line 516 sub end_while {
|
Line 600 sub end_while {
|
sub start_randomlist { |
sub start_randomlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); |
$target eq 'tex' || $target eq 'analyze') { |
|
my $body= &Apache::lonxml::get_all_text("/randomlist",$parser); |
my $b_parser= HTML::TokeParser->new(\$body); |
my $b_parser= HTML::TokeParser->new(\$body); |
my $b_tok; |
my $b_tok; |
my @randomlist; |
my @randomlist; |
Line 569 sub shuffle {
|
Line 654 sub shuffle {
|
if (defined(@$a)) { |
if (defined(@$a)) { |
&Apache::response::setrandomnumber(); |
&Apache::response::setrandomnumber(); |
for($i=@$a;--$i;) { |
for($i=@$a;--$i;) { |
my $j=int rand($i+1); |
my $j=int(&Math::Random::random_uniform() * ($i+1)); |
next if $i == $j; |
next if $i == $j; |
@$a[$i,$j] = @$a[$j,$i]; |
@$a[$i,$j] = @$a[$j,$i]; |
} |
} |
Line 593 sub start_part {
|
Line 678 sub start_part {
|
$Apache::inputtags::part=$id; |
$Apache::inputtags::part=$id; |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::responselist = (); |
@Apache::inputtags::previous=(); |
@Apache::inputtags::previous=(); |
|
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
|
|
if ($target eq 'meta') { |
if ($target eq 'meta') { |
return &Apache::response::mandatory_part_meta; |
return &Apache::response::mandatory_part_meta; |
} elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
} elsif ($target eq 'web' || $target eq 'grade' || |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
$target eq 'answer' || $target eq 'tex') { |
push (@Apache::inputtags::status,$status); |
if ($hidden) { |
my $expression='$external::datestatus="'.$status.'";'; |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; |
} else { |
&Apache::run::run($expression,$safeeval); |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
if ( $status eq 'CLOSED' ) { |
push (@Apache::inputtags::status,$status); |
my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); |
my $expression='$external::datestatus="'.$status.'";'; |
if ( $target eq "web" ) { |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";'; |
$result="<br />Part is not open to be viewed. It $accessmsg<br />"; |
&Apache::run::run($expression,$safeeval); |
} elsif ( $target eq 'tex' ) { |
if ( $status eq 'CLOSED' ) { |
$result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
|
if ( $target eq "web" ) { |
|
$result="<br />Part is not open to be viewed. It $accessmsg<br />"; |
|
} elsif ( $target eq 'tex' ) { |
|
$result="\\end{minipage}\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\\\begin{minipage}{\\textwidth}"; |
|
} |
|
} else { |
|
if ($target eq 'tex') { |
|
$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent'; |
|
my $weight = &Apache::lonnet::EXT("resource.$id.weight"); |
|
if ($Apache::lonhomework::type eq 'exam') { $result .= '\fbox{\textit{'.$weight.' pt}}';} |
|
} |
|
} |
} |
} |
} else { |
} elsif ($target eq 'edit') { |
if ($target eq 'tex') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result='\vskip 0 mm'; |
$result.=&Apache::edit::text_arg('Part ID:','id',$token). |
|
&Apache::loncommon::help_open_topic("Part_Tag_Edit_Help"). |
|
&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
|
|
|
} elsif ($target eq 'modified') { |
|
my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, |
|
'id'); |
|
if ($constructtag) { |
|
$result = &Apache::edit::rebuild_tag($token); |
|
$result.=&Apache::edit::handle_insert(); |
} |
} |
} |
|
} |
} |
return $result; |
return $result; |
} |
} |
Line 621 sub end_part {
|
Line 728 sub end_part {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
&Apache::lonxml::debug("in end_part $target "); |
&Apache::lonxml::debug("in end_part $target "); |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
pop @Apache::inputtags::status; |
my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); |
if ( $target eq 'meta' ) { return ''; } |
my $result=''; |
if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { |
if ( $target eq 'meta' ) { |
return &Apache::inputtags::grade; |
$result=''; |
} |
} elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER' && !$hidden) { |
if ($target eq 'web') { |
$result=&Apache::inputtags::grade; |
return &Apache::inputtags::gradestatus($Apache::inputtags::part); |
} elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) { |
|
my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, |
|
$target); |
|
if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} |
|
$result=$gradestatus; |
} |
} |
return ''; |
pop @Apache::inputtags::status; |
|
return $result; |
} |
} |
|
|
sub start_preduedate { |
sub start_preduedate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && |
&Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); |
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
|
&Apache::lonxml::get_all_text("/preduedate",$parser); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 649 sub end_preduedate {
|
Line 762 sub end_preduedate {
|
|
|
sub start_postanswerdate { |
sub start_postanswerdate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') { |
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
&Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
return '\vskip 0 mm \noindent'; |
return '\vskip 0 mm \noindent'; |
Line 665 sub end_postanswerdate {
|
Line 778 sub end_postanswerdate {
|
|
|
sub start_notsolved { |
sub start_notsolved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
&Apache::lonxml::debug("not solved has :$gradestatus:"); |
&Apache::lonxml::debug("not solved has :$gradestatus:"); |
if ($gradestatus =~ /^correct/) { |
if ($gradestatus =~ /^correct/) { |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/notsolved",$parser); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 682 sub end_notsolved {
|
Line 795 sub end_notsolved {
|
|
|
sub start_solved { |
sub start_solved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
if ($gradestatus !~ /^correct/) { |
if ($gradestatus !~ /^correct/) { |
&Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); |
&Apache::lonxml::get_all_text("/solved",$parser); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 707 sub end_startouttext {
|
Line 820 sub end_startouttext {
|
my $text=''; |
my $text=''; |
|
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser); |
$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td> |
$result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td> |
<td>Delete:". |
<td>Delete:". |
&Apache::edit::deletelist($target,$token) |
&Apache::edit::deletelist($target,$token) |
."</td> |
."</td> |
<td>". |
<td>". |
&Apache::edit::insertlist($target,$token). |
&Apache::edit::insertlist($target,$token). |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n" |
&Apache::edit::editfield($token->[1],$text,"",50,4); |
.'<table><tr><td>'. |
|
&Apache::loncommon::help_open_topic("Greek_Symbols",'Greek Symbols', |
|
undef,undef,600) |
|
.'</td><td>'. |
|
&Apache::loncommon::help_open_topic("Other_Symbols",'Other Symbols', |
|
undef,undef,600) |
|
.'</td></tr></table>'. |
|
&Apache::edit::editfield($token->[1],$text,"",80,4); |
} |
} |
if ($target eq 'modified') { |
if ($target eq 'modified') { |
$text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
} |
} |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 730 sub start_endouttext {
|
Line 850 sub start_endouttext {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; } |
if ($target eq "modified") { $result='<endouttext />'; } |
if ($target eq "modified") { |
|
$result='<endouttext />'. |
|
&Apache::edit::handle_insertafter('startouttext'); } |
return $result; |
return $result; |
} |
} |
sub end_endouttext { |
sub end_endouttext { |
Line 741 sub end_endouttext {
|
Line 863 sub end_endouttext {
|
} |
} |
sub delete_startouttext { |
sub delete_startouttext { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
# my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); |
# my $text=&Apache::lonxml::get_all_text("endouttext",$parser); |
my $text=$$parser['-1']->get_text("/endouttext"); |
my $text=$$parser['-1']->get_text("/endouttext"); |
my $ntoken=$$parser['-1']->get_token(); |
my $ntoken=$$parser['-1']->get_token(); |
&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); |
&Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); |