version 1.80, 2002/02/06 16:18:54
|
version 1.85, 2002/03/20 22:13:19
|
Line 79 sub page_start {
|
Line 79 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(); |
$head_tag_start='<head>'.&Apache::lonxml::registerurl(undef,$target); |
} |
} |
my $body_tag_start; |
my $body_tag_start; |
if (!defined($found{'body'})) { |
if (!defined($found{'body'})) { |
Line 162 ENDCHECKOUT
|
Line 162 ENDCHECKOUT
|
sub start_problem { |
sub start_problem { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
if ( $Apache::inputtags::part ne '' ) { |
# meta is called from lonpublisher, which doesn't uses the normal |
|
# lonhomework method of parsing the file which means that inputtags |
|
# won't get reset |
|
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[-1]); |
return ''; |
return ''; |
Line 294 sub start_problem {
|
Line 297 sub start_problem {
|
$result=$token->[4]; |
$result=$token->[4]; |
$result.=&Apache::edit::handle_insert(); |
$result.=&Apache::edit::handle_insert(); |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '\begin{document}\noindent\textbf{Problem.}\newline'; |
$result .= '\begin{document} '; |
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 307 sub end_problem {
|
Line 310 sub end_problem {
|
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' ) { |
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' && $Apache::inputtags::part eq '0') { |
Line 339 sub end_problem {
|
Line 341 sub end_problem {
|
&Apache::lonxml::debug("in end_problem with $target, edit"); |
&Apache::lonxml::debug("in end_problem with $target, edit"); |
$result='<br /><input type="submit" name="submit" value="Submit Changes" />'; |
$result='<br /><input type="submit" name="submit" value="Submit Changes" />'; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result .= '\end{document}'; |
$result .= '\noindent\makebox[9.0cm][b]{\hrulefill}\end{document}'; |
} |
} |
return $result; |
return $result; |
} |
} |
Line 605 sub end_startouttext {
|
Line 607 sub end_startouttext {
|
$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). |
"</td> |
&Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". |
</tr><tr><td colspan=\"3\">\n". |
&Apache::edit::editfield($token->[1],$text,"",50,4); |
&Apache::edit::editfield($token->[1],$text,"",50,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['-1']); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
$result='<startouttext />'.&Apache::edit::modifiedfield(); |
} |
} |
|
if ($target eq 'tex') { |
|
$result .= '\noindent '; |
|
} |
return $result; |
return $result; |
} |
} |
sub start_endouttext { |
sub start_endouttext { |