version 1.200, 2003/08/04 22:40:03
|
version 1.201, 2003/08/11 20:05:53
|
Line 625 sub end_definetag {
|
Line 625 sub end_definetag {
|
} |
} |
|
|
sub start_block { |
sub start_block { |
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') { |
my $code = $token->[2]->{'condition'}; |
my $code = $token->[2]->{'condition'}; |
if ($code) { |
if (defined($code)) { |
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 642 sub start_block {
|
Line 642 sub start_block {
|
$result='1'; |
$result='1'; |
} |
} |
if ( ! $result ) { |
if ( ! $result ) { |
my $skip=&Apache::lonxml::get_all_text("/block",$parser); |
my $skip=&Apache::lonxml::get_all_text("/block",$parser,$style); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
} |
} |
$result=''; |
$result=''; |
Line 669 sub end_block {
|
Line 669 sub end_block {
|
} |
} |
|
|
sub start_languageblock { |
sub start_languageblock { |
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') { |
&Apache::lonxml::startredirection(); |
my $include = $token->[2]->{'include'}; |
|
my $exclude = $token->[2]->{'exclude'}; |
|
my %languages=&Apache::loncommon::display_languages(); |
|
$result='1'; |
|
if ($include) { |
|
$result=''; |
|
foreach (split(/\,/,$include)) { |
|
if ($languages{$_}) { $result='1'; } |
|
} |
|
} |
|
if ($exclude) { |
|
foreach (split(/\,/,$exclude)) { |
|
if ($languages{$_}) { $result='0'; } |
|
} |
|
} |
|
if ( ! $result ) { |
|
my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser, |
|
$style); |
|
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
|
} |
|
$result=''; |
} 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('Include Language:','include', |
$result .=&Apache::edit::text_arg('Include Language:','include', |
Line 695 sub start_languageblock {
|
Line 715 sub start_languageblock {
|
sub end_languageblock { |
sub end_languageblock { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
|
if ($target eq "edit") { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze') { |
|
my $text=&Apache::lonxml::endredirection(); |
|
my $include= &Apache::lonxml::get_param('include',$parstack,$safeeval); |
|
my $exclude= &Apache::lonxml::get_param('exclude',$parstack,$safeeval); |
|
my %languages=&Apache::loncommon::display_languages(); |
|
$result='1'; |
|
if ($include) { |
|
$result=''; |
|
foreach (split(/\,/,$include)) { |
|
if ($languages{$_}) { $result='1'; } |
|
} |
|
} |
|
if ($exclude) { |
|
foreach (split(/\,/,$exclude)) { |
|
if ($languages{$_}) { $result='0'; } |
|
} |
|
} |
|
if ( ! $result ) { |
|
$result=''; |
|
} else { |
|
$result=$text; |
|
} |
|
} elsif ($target eq "edit") { |
|
$result.= &Apache::edit::tag_end($target,$token,''); |
$result.= &Apache::edit::tag_end($target,$token,''); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
sub start_instructorcomment { |
sub start_instructorcomment { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
|
|
my $result; |
my $result; |
|
|
Line 734 sub start_instructorcomment {
|
Line 730 sub start_instructorcomment {
|
$target eq 'tex' || $target eq 'analyze') { |
$target eq 'tex' || $target eq 'analyze') { |
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); |
$result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/); |
if ( ! $result ) { |
if ( ! $result ) { |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment",$parser); |
my $skip=&Apache::lonxml::get_all_text("/instructorcomment", |
|
$parser,$style); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
&Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]"); |
} |
} |
$result=''; |
$result=''; |