svn commit: r447510 - /xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm

[matts]

Author: matts
Date: Mon Sep 18 12:17:24 2006
New Revision: 447510

URL: http://svn.apache.org/viewvc?view=rev&rev=447510
Log:
Bug fix for __mk_expr_node lacking is_xml flag

Modified:
    xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm

Modified: xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm
URL: 
http://svn.apache.org/viewvc/xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm?view=diff&rev=447510&r1=447509&r2=447510
==============================================================================
--- xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm (original)
+++ xml/axkit/trunk/lib/Apache/AxKit/Language/XSP.pm Mon Sep 18 12:17:24 2006
@@ -403,7 +403,7 @@
                 "use Apache;",
                 "use Apache::Constants qw(:common);",
                 "use XML::LibXML;",
-                "Apache::AxKit::Language::XSP::Page->import( qw(__mk_text_node 
__mk_expr_node __mk_comment_node __mk_ns_element_node __mk_element_node) );",
+                "Apache::AxKit::Language::XSP::Page->import( qw(__mk_expr_node 
__mk_text_node __mk_comment_node __mk_ns_element_node __mk_element_node) );",
                ($] >= 5.008?"use utf8;":""),
                 );
 
@@ -819,7 +819,9 @@
 
         if 
(Apache::AxKit::Language::XSP::is_xsp_namespace($node->{Parent}->{NamespaceURI}))
 {
             if (!$e->manage_text() || $node->{Parent}->{Name} =~ 
/^(?:.*:)?(?:content|element)$/) {
-                return '__mk_expr_node($document, $parent, do {';
+                return $attribs{'as-xml'}
+                    ? '__mk_expr_node($document, $parent, 1, do {'
+                    : '__mk_expr_node($document, $parent, 0, do {';
             }
             elsif ($node->{Parent}->{Name} =~ /^(.*:)?(logic|expr)$/) {
                 return 'do {';
@@ -827,7 +829,9 @@
             return ' . do {';
         }
         else {
-            return '__mk_expr_node($document, $parent, do {';
+            return $attribs{'as-xml'}
+                    ? '__mk_expr_node($document, $parent, 1, do {'
+                    : '__mk_expr_node($document, $parent, 0, do {';
         }
         warn("EEEK - Should never get here!!!");
 #        warn "start Expr: CurrentEl: ", $e->current_element, "\n";