version 1.440, 2007/02/23 00:39:35
|
version 1.442, 2007/04/07 00:04:40
|
Line 585 sub callsub {
|
Line 585 sub callsub {
|
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$currentstring = &Apache::edit::tag_end($target,$token); |
$currentstring = &Apache::edit::tag_end($target,$token); |
} |
} |
} elsif ($target eq 'modified') { |
} |
|
} |
|
if ($target eq 'modified' && $nodefault eq '') { |
|
if ($currentstring eq '') { |
|
if ($token->[0] eq 'S') { |
|
$currentstring = $token->[4]; |
|
} elsif ($token->[0] eq 'E') { |
|
$currentstring = $token->[2]; |
|
} else { |
|
$currentstring = $token->[2]; |
|
} |
|
} |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
$currentstring = $token->[4]; |
|
$currentstring.=&Apache::edit::handle_insert(); |
$currentstring.=&Apache::edit::handle_insert(); |
} elsif ($token->[0] eq 'E') { |
} elsif ($token->[0] eq 'E') { |
$currentstring = $token->[2]; |
|
$currentstring.=&Apache::edit::handle_insertafter($token->[1]); |
$currentstring.=&Apache::edit::handle_insertafter($token->[1]); |
} else { |
|
$currentstring = $token->[2]; |
|
} |
} |
} |
|
} |
} |
} |
} |
use strict 'refs'; |
use strict 'refs'; |
Line 1736 sub register_insert_xml {
|
Line 1742 sub register_insert_xml {
|
my $parser = HTML::LCParser->new($Apache::lonnet::perlvar{'lonTabDir'} |
my $parser = HTML::LCParser->new($Apache::lonnet::perlvar{'lonTabDir'} |
.'/insertlist.xml'); |
.'/insertlist.xml'); |
my ($tagnum,$in_help)=(0,0); |
my ($tagnum,$in_help)=(0,0); |
|
my @alltags; |
my $tag; |
my $tag; |
while (my $token = $parser->get_token()) { |
while (my $token = $parser->get_token()) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
Line 1744 sub register_insert_xml {
|
Line 1751 sub register_insert_xml {
|
$tag = $token->[2]{'name'}; |
$tag = $token->[2]{'name'}; |
$insertlist{"$tagnum.tag"} = $tag; |
$insertlist{"$tagnum.tag"} = $tag; |
$insertlist{"$tag.num"} = $tagnum; |
$insertlist{"$tag.num"} = $tagnum; |
|
push(@alltags,$tag); |
} elsif ($in_help && $token->[1] eq 'file') { |
} elsif ($in_help && $token->[1] eq 'file') { |
$key = $tag.'.helpfile'; |
$key = $tag.'.helpfile'; |
} elsif ($in_help && $token->[1] eq 'description') { |
} elsif ($in_help && $token->[1] eq 'description') { |
Line 1757 sub register_insert_xml {
|
Line 1765 sub register_insert_xml {
|
} elsif ($token->[1] eq 'help') { |
} elsif ($token->[1] eq 'help') { |
$in_help=1; |
$in_help=1; |
} elsif ($token->[1] eq 'allow') { |
} elsif ($token->[1] eq 'allow') { |
my $allow = $parser->get_text(); |
$key = $tag.'.allow'; |
foreach my $element (split(',',$allow)) { |
|
$element =~ s/(^\s*|\s*$ )//gx; |
|
push(@{ $insertlist{$tag.'.which'} },$element); |
|
} |
|
} |
} |
if (defined($key)) { |
if (defined($key)) { |
$insertlist{$key} = $parser->get_text(); |
$insertlist{$key} = $parser->get_text(); |
Line 1776 sub register_insert_xml {
|
Line 1780 sub register_insert_xml {
|
} |
} |
} |
} |
} |
} |
|
|
|
# parse the allows and ignore tags set to <show>no</show> |
|
foreach my $tag (@alltags) { |
|
my $allow = $insertlist{"$tag.allow"}; |
|
foreach my $element (split(',',$allow)) { |
|
$element =~ s/(^\s*|\s*$ )//gx; |
|
if ($insertlist{"$element.show"} ne 'no') { |
|
push(@{ $insertlist{$tag.'.which'} },$element); |
|
} |
|
} |
|
} |
} |
} |
|
|
sub register_insert { |
sub register_insert { |