Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change the default include type from XML to x-auto so that by default we can include other templates without knowing what they are.

Browse Source
This commit is contained in:
ian%hixie.ch 2002-04-30 00:24:48 +00:00
parent 0cc155547e
commit cb000c2459
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
webtools/PLIF/PLIF/Service/Coses.pm
View File

@ -177,24 +177,14 @@ sub expand {
# useful if xml:space is set to 'default'
$result .= $self->escape($app, "\n", $scope);
} elsif ($node eq '{http://bugzilla.mozilla.org/coses}include') {
if ((not exists($attributes->{'parse'})) or ($attributes->{'parse'} eq 'xml')) {
if ((not exists($attributes->{'parse'})) or ($attributes->{'parse'} eq 'x-auto')) {
# This is similar to an XInclude, but is done
# later (during processing of the infoset, not
# while it is being made) and doesn't support
# any value for 'href'. Plus it has an
# extension to the 'parse' attribute.
push(@index, $index);
push(@stack, $stack);
$index = 0;
my($type, $version, $string) = $app->getService('dataSource.strings')->getString($app, $session, $protocol, $self->evaluateExpression($attributes->{'href'}, $scope, $originalKeys));
$self->assert($type eq 'COSES', 1, 'Tried to include a non-COSES string as COSES data. Set the \'parse\' attribute to \'text\' or \'x-auto\' to handle this correctly.');
$stack = $xmlService->parseNS($string);
push(@scope, $superscope);
} elsif ($attributes->{'parse'} eq 'text') {
# raw text inclusion
my($type, $version, $string) = $app->getService('dataSource.strings')->getString($app, $session, $protocol, $self->evaluateExpression($attributes->{'href'}, $scope, $originalKeys));
$result .= $self->escape($app, $string, $scope);
} elsif ($attributes->{'parse'} eq 'x-auto') {
# extension to the 'parse' attribute and uses
# that as the default.
#
# Get the string expanded automatically and
# insert it into the result.
# XXX the nested string will have a corrupted
@ -202,6 +192,18 @@ sub expand {
$result .= $self->escape($app, $app->getService('dataSource.strings')->getExpandedString($app, $session, $protocol,
$self->evaluateExpression($attributes->{'href'}, $scope, $originalKeys), $scope),
$scope);
} elsif ($attributes->{'parse'} eq 'text') {
# raw text inclusion
my($type, $version, $string) = $app->getService('dataSource.strings')->getString($app, $session, $protocol, $self->evaluateExpression($attributes->{'href'}, $scope, $originalKeys));
$result .= $self->escape($app, $string, $scope);
} elsif ($attributes->{'parse'} eq 'xml') {
push(@index, $index);
push(@stack, $stack);
$index = 0;
my($type, $version, $string) = $app->getService('dataSource.strings')->getString($app, $session, $protocol, $self->evaluateExpression($attributes->{'href'}, $scope, $originalKeys));
$self->assert($type eq 'COSES', 1, 'Tried to include a non-COSES string as COSES data. Set the \'parse\' attribute to \'text\' or \'x-auto\' to handle this correctly.');
$stack = $xmlService->parseNS($string);
push(@scope, $superscope);
}
next node; # skip default handling
} elsif ($node eq '{http://bugzilla.mozilla.org/coses}else') {