version 1.128, 2005/06/06 01:29:45
|
version 1.133, 2005/12/01 18:46:17
|
Line 105 sub start_script {
|
Line 105 sub start_script {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); |
} elsif ( $target eq 'web' || $target eq 'tex' || |
} elsif ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'grade' || $target eq 'webgrade' || |
$target eq 'analyze' ) { |
$target eq 'answer' || $target eq 'analyze' ) { |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
Line 172 sub start_display {
|
Line 172 sub start_display {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); |
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); |
} elsif ( $target eq 'web' || $target eq 'tex' || |
} elsif ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'grade' || $target eq 'webgrade' || |
$target eq 'analyze') { |
$target eq 'answer' || $target eq 'analyze') { |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
Line 308 sub start_window {
|
Line 308 sub start_window {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); |
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); |
$result.=&Apache::edit::text_arg('Height:','width',$token,5); |
$result.=&Apache::edit::text_arg('Height:','height',$token,5); |
$result.=&Apache::edit::text_arg('Width:','height',$token,5); |
$result.=&Apache::edit::text_arg('Width:','width',$token,5); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
$safeeval,'linttext', |
$safeeval,'linktext', |
'width','height'); |
'width','height'); |
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } |
} |
} |
Line 442 sub start_standalone {
|
Line 442 sub start_standalone {
|
my $result=''; |
my $result=''; |
if ($target eq 'web' ) { |
if ($target eq 'web' ) { |
if ( $env{'request.course.id'} ) { |
if ( $env{'request.course.id'} ) { |
my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); |
my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); |
} else { |
} else { |
$result='<table bgcolor="#E1E1E1" border="2"><tr><td>'; |
$result='<table bgcolor="#E1E1E1" border="2"><tr><td>'; |
} |
} |
Line 467 sub start_comment {
|
Line 467 sub start_comment {
|
my $result=''; |
my $result=''; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) |
} elsif ( $target eq 'modified') { |
} elsif ( $target eq 'modified') { |
$result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); |
$result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); |
} elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
} elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
$target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { |
$target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { |
#normally throw away comments |
#normally throw away comments |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 501 sub xmlparse {
|
Line 501 sub xmlparse {
|
@Apache::scripttag::parser_env; |
@Apache::scripttag::parser_env; |
my @parser; |
my @parser; |
&Apache::lonxml::newparser(\@parser,\$string); |
&Apache::lonxml::newparser(\@parser,\$string); |
|
&Apache::lonxml::startredirection(); |
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, |
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, |
$parstack,\@parser, |
$parstack,\@parser, |
$safeeval,$style); |
$safeeval,$style); |
|
$result.=&Apache::lonxml::endredirection(); |
&Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); |
&Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); |
return $result; |
return $result; |
} |
} |