You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axkit-dev@xml.apache.org by ma...@apache.org on 2004/05/20 20:44:44 UTC
cvs commit: xml-axkit/lib/Apache/AxKit/Provider File.pm
mach 2004/05/20 11:44:44
Modified: lib/Apache/AxKit Tag: axkit-pipeline-2 Pipeline.pm
lib/Apache/AxKit/Pipeline Tag: axkit-pipeline-2 Head.pm
SAX.pm XSP.pm
lib/Apache/AxKit/Provider Tag: axkit-pipeline-2 File.pm
Log:
send_sax now get_sax
Revision Changes Path
No revision
No revision
1.1.2.8 +4 -1 xml-axkit/lib/Apache/AxKit/Attic/Pipeline.pm
Index: Pipeline.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Attic/Pipeline.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- Pipeline.pm 10 Dec 2003 22:50:45 -0000 1.1.2.7
+++ Pipeline.pm 20 May 2004 18:44:44 -0000 1.1.2.8
@@ -120,6 +120,8 @@
return $parser->parse_string(${ $self->get_strref( $r )}, $r->uri());
}
+
+
sub get_strref{
# $self, $r
my $str = shift->get_dom( @_ )->toString();
@@ -144,7 +146,8 @@
return $provider;
}
-sub send_sax{
+
+sub get_sax{
my ($self, $r, $parser, $pipeline ) = @_;
$parser->set_handler( Handler => $pipeline );
No revision
No revision
1.1.2.5 +1 -1 xml-axkit/lib/Apache/AxKit/Pipeline/Attic/Head.pm
Index: Head.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Pipeline/Attic/Head.pm,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Head.pm 10 Dec 2003 22:50:45 -0000 1.1.2.4
+++ Head.pm 20 May 2004 18:44:44 -0000 1.1.2.5
@@ -43,7 +43,7 @@
return shift->upstream()->key( @_ );
}
-sub send_sax{
+sub get_sax{
my ($self, $r, $parser, $pipeline ) = @_;
$parser->set_handler( Handler => $pipeline );
1.1.2.3 +4 -4 xml-axkit/lib/Apache/AxKit/Pipeline/Attic/SAX.pm
Index: SAX.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Pipeline/Attic/SAX.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SAX.pm 10 Dec 2003 22:50:45 -0000 1.1.2.2
+++ SAX.pm 20 May 2004 18:44:44 -0000 1.1.2.3
@@ -43,7 +43,7 @@
my $parser = XML::SAX::ParserFactory->parser();
# $self->href() in this case contains the sax stylesheet name.
my $dom_builder = XML::LibXML::SAX::Builder->new();
- return $self->send_sax( $r, $parser, $dom_builder);
+ return $self->get_sax( $r, $parser, $dom_builder);
}
@@ -52,12 +52,12 @@
my $str;
my $parser = XML::SAX::ParserFactory->parser();
- $self->send_sax( $r, $parser, XML::SAX::Writer->new( Output => \$str) );
+ $self->get_sax( $r, $parser, XML::SAX::Writer->new( Output => \$str) );
return \$str;
}
-sub send_sax{
+sub get_sax{
my ($self, $r, $parser, $pipeline) = @_;
my $instance = $self->saxprocessor();
@@ -71,7 +71,7 @@
}
my $stage = $self->stage();
AxKit::Debug(4, "SAX[$stage]: Requesting upstream sax events");
- return $self->upstream()->send_sax( $r, $parser, $instance );
+ return $self->upstream()->get_sax( $r, $parser, $instance );
}
1;
1.1.2.4 +1 -1 xml-axkit/lib/Apache/AxKit/Pipeline/Attic/XSP.pm
Index: XSP.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Pipeline/Attic/XSP.pm,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XSP.pm 10 Dec 2003 22:50:45 -0000 1.1.2.3
+++ XSP.pm 20 May 2004 18:44:44 -0000 1.1.2.4
@@ -207,7 +207,7 @@
sub get_dom{
my $self = shift;
- my ($r, $last_in_chain) = @_;
+ my ($r) = @_;
my $stage = $self->stage();
my $axkit_add_depends = \&AxKit::add_depends;
No revision
No revision
1.15.2.1 +4 -2 xml-axkit/lib/Apache/AxKit/Provider/File.pm
Index: File.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Provider/File.pm,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- File.pm 17 Sep 2003 21:58:38 -0000 1.15
+++ File.pm 20 May 2004 18:44:44 -0000 1.15.2.1
@@ -36,8 +36,10 @@
AxKit::Debug(7, "[uri] File Provider looking up uri $p{uri}");
- # assumed already UTF-8
+ # assumed already UTF-8
+
$self->{apache} = $r->lookup_uri(AxKit::FromUTF8($p{uri}));
+
my $status = $self->{apache}->status();
if ($status != HTTP_OK) {
throw Apache::AxKit::Exception::Error(-text => "Subrequest failed with status: " . $status);