matts 2003/07/16 08:02:11
Modified: lib/Apache/AxKit/Language XSP.pm
Log:
Fix for this situation:
<xsp:element name="foo">
<xsp:expr>"bar"</xsp:expr>
</xsp:element>
Revision Changes Path
1.45 +3 -3 xml-axkit/lib/Apache/AxKit/Language/XSP.pm
Index: XSP.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Language/XSP.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- XSP.pm 16 Jul 2003 08:52:00 -0000 1.44
+++ XSP.pm 16 Jul 2003 15:02:11 -0000 1.45
@@ -756,7 +756,7 @@
#warn "expr: parent = {", $node->{Parent}->{NamespaceURI}, "}",
$node->{Parent}->{Name}, "\n";
if
(Apache::AxKit::Language::XSP::is_xsp_namespace($node->{Parent}->{NamespaceURI}))
{
- if (!$e->manage_text() || $node->{Parent}->{Name} =~
/^(.*:)?content$/) {
+ if (!$e->manage_text() || $node->{Parent}->{Name} =~
/^(?:.*:)?(?:content|element)$/) {
return '__mk_text_node($document, $parent, "" . do {';
}
elsif ($node->{Parent}->{Name} =~ /^(.*:)?(logic|expr)$/) {
@@ -826,7 +826,7 @@
elsif ($tag eq 'expr') {
# warn "expr: -2 = {", $node->{Parent}->{NamespaceURI}, "}",
$node->{Parent}->{Name}, "\n";
if
(Apache::AxKit::Language::XSP::is_xsp_namespace($node->{Parent}->{NamespaceURI}))
{
- if (!$e->manage_text() || $node->{Parent}->{Name} =~
/^(.*:)?content$/) {
+ if (!$e->manage_text() || $node->{Parent}->{Name} =~
/^(?:.*:)?(?:content|element)$/) {
return "}); # xsp tag\n";
}
elsif ($node->{Parent}->{Name} =~ /^(.*:)?(logic|expr)$/) {
