svn commit: r447506 - in /xml/axkit/trunk/lib/Apache/AxKit: Language/LibXSLT.pm LibXMLCallbacks.pm Provider.pm

[matts]

Author: matts
Date: Mon Sep 18 12:11:36 2006
New Revision: 447506

URL: http://svn.apache.org/viewvc?view=rev&rev=447506
Log:
Further fixes for libxml callbacks (Alexey Ukhov and Hansjoerg Pehofer)

Modified:
    xml/axkit/trunk/lib/Apache/AxKit/Language/LibXSLT.pm
    xml/axkit/trunk/lib/Apache/AxKit/LibXMLCallbacks.pm
    xml/axkit/trunk/lib/Apache/AxKit/Provider.pm

Modified: xml/axkit/trunk/lib/Apache/AxKit/Language/LibXSLT.pm
URL: 
http://svn.apache.org/viewvc/xml/axkit/trunk/lib/Apache/AxKit/Language/LibXSLT.pm?view=diff&rev=447506&r1=447505&r2=447506
==============================================================================
--- xml/axkit/trunk/lib/Apache/AxKit/Language/LibXSLT.pm (original)
+++ xml/axkit/trunk/lib/Apache/AxKit/Language/LibXSLT.pm Mon Sep 18 12:11:36 
2006
@@ -66,7 +66,7 @@
     my $parser = Apache::AxKit::LibXML->new();
     $parser->expand_entities(1);
     $parser->expand_xinclude(1);
-    local $Apache::AxKit::LibXMLSupport::provider_cb = 
+    local $Apache::AxKit::LibXMLCallbacks::provider_cb = 
         sub {
             my $r = shift;
             my $provider = Apache::AxKit::Provider->new_content_provider($r);
@@ -110,7 +110,7 @@
         
         my $xslt = XML::LibXSLT->new();
         $xslt->input_callbacks( 
Apache::AxKit::LibXMLCallbacks->input_callbacks() );
-        local $Apache::AxKit::LibXMLSupport::provider_cb = 
+        local $Apache::AxKit::LibXMLCallbacks::provider_cb = 
             sub {
                 my $r = shift;
                 my $provider = Apache::AxKit::Provider->new_style_provider($r);

Modified: xml/axkit/trunk/lib/Apache/AxKit/LibXMLCallbacks.pm
URL: 
http://svn.apache.org/viewvc/xml/axkit/trunk/lib/Apache/AxKit/LibXMLCallbacks.pm?view=diff&rev=447506&r1=447505&r2=447506
==============================================================================
--- xml/axkit/trunk/lib/Apache/AxKit/LibXMLCallbacks.pm (original)
+++ xml/axkit/trunk/lib/Apache/AxKit/LibXMLCallbacks.pm Mon Sep 18 12:11:36 2006
@@ -10,6 +10,7 @@
 sub input_callbacks {
     my $class = shift;
     my $icb = XML::LibXML::InputCallback->new();
+    $icb->cleanup_callbacks();
     $icb->register_callbacks( [ \&match_uri, \&open_uri,
                                 \&read_uri, \&close_uri ] );
     return $icb;

Modified: xml/axkit/trunk/lib/Apache/AxKit/Provider.pm
URL: 
http://svn.apache.org/viewvc/xml/axkit/trunk/lib/Apache/AxKit/Provider.pm?view=diff&rev=447506&r1=447505&r2=447506
==============================================================================
--- xml/axkit/trunk/lib/Apache/AxKit/Provider.pm (original)
+++ xml/axkit/trunk/lib/Apache/AxKit/Provider.pm Mon Sep 18 12:11:36 2006
@@ -161,7 +161,8 @@
 
 sub get_dom {
     my ($self, $str) = @_;
-    require Apache::AxKit::LibXMLSupport;
+    require Apache::AxKit::LibXML;
+    require Apache::AxKit::LibXMLCallbacks;
     
     AxKit::Debug(8, "Provider::get_dom");
     my $parser = Apache::AxKit::LibXML->new();