version 1.325, 2005/11/21 22:16:38
|
version 1.331, 2006/01/18 20:16:43
|
Line 42 BEGIN {
|
Line 42 BEGIN {
|
} |
} |
|
|
sub start_web { |
sub start_web { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style); |
if ($target eq 'web') { |
if ($target eq 'web') { |
return $bodytext; |
return $bodytext; |
} |
} |
Line 55 sub end_web {
|
Line 55 sub end_web {
|
} |
} |
|
|
sub start_tex { |
sub start_tex { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style); |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
return $bodytext.' '; |
return $bodytext.' '; |
} |
} |
Line 113 sub page_start {
|
Line 113 sub page_start {
|
&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::htmlareaheaders(). |
&Apache::lonhtmlcommon::spellheader(). |
&Apache::lonhtmlcommon::spellheader(). |
&Apache::lonxml::fontsettings(); |
&Apache::lonxml::fontsettings(); |
|
if ($target eq 'edit') { |
|
$head_tag_start.=&Apache::edit::js_change_detection(); |
|
} |
} |
} |
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { |
if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') { |
Line 150 sub page_start {
|
Line 153 sub page_start {
|
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="'; |
$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="'; |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
$form_tag_start.=$uri.'">'; |
$form_tag_start.=$uri.'" '; |
|
if ($target eq 'edit') { |
|
$form_tag_start.=&Apache::edit::form_change_detection(); |
|
} |
|
$form_tag_start.='>'; |
} |
} |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
return ($result,$head_tag_start,$body_tag_start,$form_tag_start); |
} |
} |
Line 225 sub problem_edit_header {
|
Line 232 sub problem_edit_header {
|
&Apache::structuretags::remember_problem_state().' |
&Apache::structuretags::remember_problem_state().' |
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" /> |
<input type="hidden" name="problemmode" value="'.&mt('Edit').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" /> |
<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
<input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr /> |
<input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" /> |
<input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" /> |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'. |
<input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'. |
Line 514 sub get_problem_status {
|
Line 521 sub get_problem_status {
|
} |
} |
|
|
sub start_problem { |
sub start_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
# We'll use the redirection to fix up printing of duedates. |
# We'll use the redirection to fix up printing of duedates. |
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
Line 527 sub start_problem {
|
Line 534 sub start_problem {
|
if ( $Apache::inputtags::part ne '' || |
if ( $Apache::inputtags::part ne '' || |
$Apache::lonhomework::parsing_a_problem) { |
$Apache::lonhomework::parsing_a_problem) { |
&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); |
#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,$style); |
return ''; |
return ''; |
} |
} |
|
|
Line 630 sub start_problem {
|
Line 637 sub start_problem {
|
( $status eq 'UNAVAILABLE') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'INVALID_ACCESS')) { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
|
$style); |
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; |
Line 658 sub start_problem {
|
Line 666 sub start_problem {
|
} |
} |
} |
} |
} elsif ($status eq 'NEEDS_CHECKIN') { |
} elsif ($status eq 'NEEDS_CHECKIN') { |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser, |
|
$style); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result .= $head_tag_start.'</head>'; |
$result .= $head_tag_start.'</head>'; |
$result .= $body_tag_start; |
$result .= $body_tag_start; |
Line 710 sub end_problem {
|
Line 719 sub end_problem {
|
|
|
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
$result = &Apache::lonxml::endredirection(); #started in &start_problem |
$result = &Apache::lonxml::endredirection(); #started in &start_problem |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 933 sub end_library {
|
Line 943 sub end_library {
|
} |
} |
|
|
sub start_definetag { |
sub start_definetag { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
my $name = $token->[2]->{'name'}; |
my $name = $token->[2]->{'name'}; |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser); |
my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style); |
if ($name=~/^\//) { |
if ($name=~/^\//) { |
$result= |
$result= |
'<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>'; |
'<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>'; |
Line 1084 sub end_instructorcomment {
|
Line 1094 sub end_instructorcomment {
|
} |
} |
|
|
sub start_while { |
sub start_while { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
Line 1096 sub start_while {
|
Line 1106 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=&Apache::lonxml::get_all_text("/while",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/while",$parser,$style); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whilebody, $bodytext); |
push( @Apache::structuretags::whileline, $token->[5]); |
push( @Apache::structuretags::whileline, $token->[5]); |
&Apache::lonxml::debug("s code $code got -$result-"); |
&Apache::lonxml::debug("s code $code got -$result-"); |
Line 1152 sub end_while {
|
Line 1162 sub end_while {
|
# ... |
# ... |
# </randomlist> |
# </randomlist> |
sub start_randomlist { |
sub start_randomlist { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' || |
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
Line 1245 sub ordered_show_check {
|
Line 1255 sub ordered_show_check {
|
} |
} |
|
|
sub start_part { |
sub start_part { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
&Apache::lonxml::startredirection(); # we'll use redirection to fix up |
&Apache::lonxml::startredirection(); # we'll use redirection to fix up |
# duedates. |
# duedates. |
Line 1274 sub start_part {
|
Line 1284 sub start_part {
|
} elsif ($target eq 'web' || $target eq 'grade' || |
} elsif ($target eq 'web' || $target eq 'grade' || |
$target eq 'answer' || $target eq 'tex') { |
$target eq 'answer' || $target eq 'tex') { |
if ($hidden || !$in_order_show) { |
if ($hidden || !$in_order_show) { |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style); |
} else { |
} else { |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); |
push (@Apache::inputtags::status,$status); |
push (@Apache::inputtags::status,$status); |
Line 1290 sub start_part {
|
Line 1300 sub start_part {
|
( $status eq 'BANNED') || |
( $status eq 'BANNED') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'INVALID_ACCESS')) { |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/part",$parser, |
|
$style); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />"; |
$result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />"; |
} elsif ( $target eq 'tex' ) { |
} elsif ( $target eq 'tex' ) { |
Line 1361 sub end_part {
|
Line 1372 sub end_part {
|
my $result; |
my $result; |
if (!$Apache::lonxml::metamode) { |
if (!$Apache::lonxml::metamode) { |
$result = &Apache::lonxml::endredirection(); # started in &start_part |
$result = &Apache::lonxml::endredirection(); # started in &start_part |
|
$Apache::lonxml::post_evaluate=0; |
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade') { |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && |
Line 1392 sub end_part {
|
Line 1404 sub end_part {
|
} |
} |
|
|
sub start_preduedate { |
sub start_preduedate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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') { |
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); |
&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']); |
if (!$Apache::lonhomework::scantronmode && |
if (!$Apache::lonhomework::scantronmode && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') { |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER')); |
&Apache::lonxml::get_all_text("/preduedate",$parser); |
&Apache::lonxml::get_all_text("/preduedate",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1410 sub end_preduedate {
|
Line 1422 sub end_preduedate {
|
} |
} |
|
|
sub start_postanswerdate { |
sub start_postanswerdate { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
if ($target eq 'web' || $target eq 'grade') { |
if ($target eq 'web' || $target eq 'grade') { |
if ($Apache::lonhomework::scantronmode || |
if ($Apache::lonhomework::scantronmode || |
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
$Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); |
} |
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
&Apache::lonxml::get_all_text("/postanswerdate",$parser); |
&Apache::lonxml::get_all_text("/postanswerdate",$parser,$style); |
} |
} |
return ''; |
return ''; |
} |
} |
Line 1427 sub end_postanswerdate {
|
Line 1439 sub end_postanswerdate {
|
} |
} |
|
|
sub start_notsolved { |
sub start_notsolved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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 'tex') { |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; |
Line 1435 sub start_notsolved {
|
Line 1447 sub start_notsolved {
|
if ($gradestatus =~ /^correct/ && |
if ($gradestatus =~ /^correct/ && |
&Apache::response::show_answer()) { |
&Apache::response::show_answer()) { |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::debug("skipping"); |
&Apache::lonxml::get_all_text("/notsolved",$parser); |
&Apache::lonxml::get_all_text("/notsolved",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1446 sub end_notsolved {
|
Line 1458 sub end_notsolved {
|
} |
} |
|
|
sub start_solved { |
sub start_solved { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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 '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::response::show_answer()) { |
!&Apache::response::show_answer()) { |
&Apache::lonxml::get_all_text("/solved",$parser); |
&Apache::lonxml::get_all_text("/solved",$parser,$style); |
} |
} |
} |
} |
return ''; |
return ''; |
Line 1463 sub end_solved {
|
Line 1475 sub end_solved {
|
} |
} |
|
|
sub start_problemtype { |
sub start_problemtype { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
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') { |
Line 1475 sub start_problemtype {
|
Line 1487 sub start_problemtype {
|
if ($Apache::lonhomework::type eq lc($type)) { $found=1; } |
if ($Apache::lonhomework::type eq lc($type)) { $found=1; } |
} |
} |
if ($mode eq 'show' && !$found) { |
if ($mode eq 'show' && !$found) { |
&Apache::lonxml::get_all_text("/problemtype",$parser); |
&Apache::lonxml::get_all_text("/problemtype",$parser,$style); |
} |
} |
if ($mode eq 'hide' && $found) { |
if ($mode eq 'hide' && $found) { |
&Apache::lonxml::get_all_text("/problemtype",$parser); |
&Apache::lonxml::get_all_text("/problemtype",$parser,$style); |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
Line 1512 sub start_startouttext {
|
Line 1524 sub start_startouttext {
|
} |
} |
|
|
sub end_startouttext { |
sub end_startouttext { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
my $text=''; |
my $text=''; |
|
|
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$text=&Apache::lonxml::get_all_text("endouttext",$parser); |
$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td> |
<td>".&mt('Delete:'). |
<td>".&mt('Delete:'). |
&Apache::edit::deletelist($target,$token) |
&Apache::edit::deletelist($target,$token) |
Line 1556 sub end_endouttext {
|
Line 1568 sub end_endouttext {
|
} |
} |
|
|
sub delete_startouttext { |
sub delete_startouttext { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
# my $text=&Apache::lonxml::get_all_text("endouttext",$parser); |
# my $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style); |
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"); |
Line 1574 sub start_simpleeditbutton {
|
Line 1586 sub start_simpleeditbutton {
|
my $result=''; |
my $result=''; |
if (($env{'form.simple_edit_button'} ne 'off') && |
if (($env{'form.simple_edit_button'} ne 'off') && |
($target eq 'web') && |
($target eq 'web') && |
(&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) { |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { |
my $url=$env{'request.noversionuri'}; |
my $url=$env{'request.noversionuri'}; |
$url=~s/\?.*$//; |
$url=~s/\?.*$//; |
my ($symb) = &Apache::lonxml::whichuser(); |
my ($symb) = &Apache::lonxml::whichuser(); |