Revision: 17
Author: matt
Date: 2006-07-29 01:19:52 +0000 (Sat, 29 Jul 2006)
Log Message:
-----------
XSP works now
Modified Paths:
--------------
trunk/etc/axkit.conf
trunk/lib/AxKit2/Connection.pm
trunk/lib/AxKit2/Plugin.pm
trunk/lib/AxKit2/Processor.pm
trunk/lib/AxKit2/Transformer/XSP.pm
trunk/plugins/serve_xslt
Modified: trunk/etc/axkit.conf
===================================================================
--- trunk/etc/axkit.conf 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/etc/axkit.conf 2006-07-29 01:19:52 UTC (rev 17)
@@ -30,5 +30,11 @@
XSLT_Style /Users/matt/Perl/xml-axkit/t/htdocs/style/xslt-basic/01.xsl
</Location>
-
+
+ <Location /xsp>
+ DocumentRoot /Users/matt/Perl/AxKit2/trunk/demo
+ Plugin serve_xsp
+ XSP_Match .*\.xsp
+ </Location>
+
</Server>
Modified: trunk/lib/AxKit2/Connection.pm
===================================================================
--- trunk/lib/AxKit2/Connection.pm 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/lib/AxKit2/Connection.pm 2006-07-29 01:19:52 UTC (rev 17)
@@ -6,6 +6,7 @@
use AxKit2::HTTPHeaders;
use AxKit2::Constants;
+use AxKit2::Processor;
use HTTP::Date ();
use fields qw(
Modified: trunk/lib/AxKit2/Plugin.pm
===================================================================
--- trunk/lib/AxKit2/Plugin.pm 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/lib/AxKit2/Plugin.pm 2006-07-29 01:19:52 UTC (rev 17)
@@ -112,6 +112,7 @@
"\n",
"package $package;",
'use AxKit2::Constants;',
+ 'use AxKit2::Processor;',
"require AxKit2::Plugin;",
'use vars qw(@ISA);',
'use strict;',
Modified: trunk/lib/AxKit2/Processor.pm
===================================================================
--- trunk/lib/AxKit2/Processor.pm 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/lib/AxKit2/Processor.pm 2006-07-29 01:19:52 UTC (rev 17)
@@ -65,7 +65,7 @@
$self->{output}->($client, $self->dom);
}
else {
- my $out = $self->dom->as_string;
+ my $out = $self->dom->toString;
$client->headers_out->header('Content-Length', length($out));
$client->headers_out->header('Content-Type', 'text/xml');
$client->send_http_headers;
Modified: trunk/lib/AxKit2/Transformer/XSP.pm
===================================================================
--- trunk/lib/AxKit2/Transformer/XSP.pm 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/lib/AxKit2/Transformer/XSP.pm 2006-07-29 01:19:52 UTC (rev 17)
@@ -203,8 +203,7 @@
$e->{XSP_Script} = join("\n",
$e->location_debug_string,
"package $e->{XSP_Package};",
- "use Apache;",
- "use Apache::Constants qw(:common);",
+ "use AxKit2::Constants;",
"use XML::LibXML;",
"AxKit2::Transformer::XSP::Page->import( qw(__mk_text_node
__mk_comment_node __mk_ns_element_node __mk_element_node) );",
($] >= 5.008?"use utf8;":""),
@@ -293,7 +292,6 @@
$e->{XSP_Script} .= AxKit2::XSP::DefaultHandler::start_element($e,
$element);
}
else {
-# local $^W;
$element->{Name} =~ s/^(.*)://;
my $prefix = $1;
my $tag = $element->{Name};
@@ -331,7 +329,6 @@
$e->{XSP_Script} .= AxKit2::XSP::DefaultHandler::end_element($e,
$element);
}
else {
-# local $^W;
$element->{Name} =~ s/^(.*)://;
my $tag = $element->{Name};
my $pkg = $AxKit2::Transformer::XSP::tag_lib{ $ns };
@@ -387,7 +384,6 @@
$e->{XSP_Script} .= AxKit2::XSP::DefaultHandler::comment($e, $comment);
}
else {
-# local $^W;
my $pkg = $AxKit2::Transformer::XSP::tag_lib{ $ns };
my $sub;
local $AxKit2::XSP::TaglibPkg = $pkg;
@@ -412,7 +408,6 @@
$e->{XSP_Script} .=
AxKit2::XSP::DefaultHandler::processing_instruction($e, $pi);
}
else {
-# local $^W;
my $pkg = $AxKit2::Transformer::XSP::tag_lib{ $ns };
my $sub;
local $AxKit2::XSP::TaglibPkg = $pkg;
@@ -464,8 +459,6 @@
sub characters {
my ($e, $node) = @_;
- local $^W;
-
my $text = $node->{Data};
# Ricardo writes: "<xsp:expr> produces either an [object]
@@ -520,8 +513,7 @@
if ($attribs{language} && lc($attribs{language}) ne 'perl') {
die "Only Perl XSP pages supported at this time!";
}
- local $^W;
- if ($attribs{'indent-result'} eq 'yes') {
+ if ($attribs{'indent-result'} && $attribs{'indent-result'} eq 'yes') {
$e->{XSP_Indent} = 1;
}
if (exists $attribs{'base-class'}) {
@@ -988,7 +980,8 @@
};
}
}
-
+
+ no warnings 'uninitialized';
my $lineno = eval { $element->lineNumber; } if $debug;
my $node = {
Name => encodeToUTF8($encoding,$element->getName),
Modified: trunk/plugins/serve_xslt
===================================================================
--- trunk/plugins/serve_xslt 2006-07-28 20:40:11 UTC (rev 16)
+++ trunk/plugins/serve_xslt 2006-07-29 01:19:52 UTC (rev 17)
@@ -23,11 +23,6 @@
$conf->notes($key);
}
-use File::Spec::Functions qw(catfile canonpath);
-use AxKit2::Processor;
-
-my %cache;
-
sub hook_xmlresponse {
my ($self, $input) = @_;
