X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl-sax%2FXML%2FTemplateSAX.pm;h=e5e6e400fe629eca73edf539c65decdcd289c486;hb=933565bfd7b14e26bf9dbc2afc7271e28ec34398;hp=638f4b2582425d0539564a1351beb62f05c7bf51;hpb=83eb1374310b3ebc3523f7bc37adee80bde03184;p=xml-template

diff --git a/perl-sax/XML/TemplateSAX.pm b/perl-sax/XML/TemplateSAX.pm
index 638f4b2..e5e6e40 100644
--- a/perl-sax/XML/TemplateSAX.pm
+++ b/perl-sax/XML/TemplateSAX.pm
@@ -14,7 +14,10 @@
 # - You can no longer insert a DOM tree, naturally. Instead, you can set up
 #   an XML::TemplateSAX::Buffer, let it gobble up your data, and send it
 #   in the way you'd insert a DOM tree. process_file_to_buffer does this
-#   transparently for you, returning a buffer you can give in.
+#   transparently for you, returning a buffer you can give in. (In theory,
+#   one could avoid the buffering and just defer the parsing/filtering until
+#   it's needed, but Expat seems non-reentrant, which means starting a parser
+#   from within a begin_element callback blows up.)
 #
 
 use strict;
@@ -27,20 +30,18 @@ use XML::TemplateSAX::Handler;
 
 package XML::TemplateSAX;
 
-sub process_file {
-	my ($filename, $obj, $clean) = @_;
+sub process_file_to_handler {
+	my ($filename, $handler, $obj, $clean) = @_;
 	$clean = 1 unless (defined($clean));
 
-	my ($writer, $cleaner, $filter, $parser);
+	my ($cleaner, $filter, $parser);
 	my $str = '';
 
-	$writer = XML::SAX::Writer->new(Output => \$str);
-
 	if ($clean) {
-		$cleaner = XML::TemplateSAX::Cleaner->new(Handler => $writer, Content => $obj);
+		$cleaner = XML::TemplateSAX::Cleaner->new(Handler => $handler);
 		$filter = XML::TemplateSAX::Handler->new(Handler => $cleaner, Content => $obj);
 	} else {
-		$filter = XML::TemplateSAX::Handler->new(Handler => $writer, Content => $obj);
+		$filter = XML::TemplateSAX::Handler->new(Handler => $handler, Content => $obj);
 	}
 
 	# FIXME: hardcoding expat = not good?
@@ -50,24 +51,22 @@ sub process_file {
 	return $str;
 }
 
-sub process_file_to_buffer {
+sub process_file {
 	my ($filename, $obj, $clean) = @_;
-	$clean = 1 unless (defined($clean));
 
-	my ($buffer, $cleaner, $filter, $parser);
+	my $str = '';
+	my $writer = XML::SAX::Writer->new(Output => \$str);
 
-	$buffer = XML::TemplateSAX::Buffer->new;
+	process_file_to_handler($filename, $writer, $obj, $clean);
 
-	if ($clean) {
-		$cleaner = XML::TemplateSAX::Cleaner->new(Handler => $buffer, Content => $obj);
-		$filter = XML::TemplateSAX::Handler->new(Handler => $cleaner, Content => $obj);
-	} else {
-		$filter = XML::TemplateSAX::Handler->new(Handler => $buffer, Content => $obj);
-	}
+	return $str;
+}
 
-	# FIXME: hardcoding expat = not good?
-	$parser = XML::SAX::Expat->new(Handler => $filter);
-	$parser->parse_file($filename);
+sub process_file_to_buffer {
+	my ($filename, $obj, $clean) = @_;
+	
+	my $buffer = XML::TemplateSAX::Buffer->new;
+	process_file_to_handler($filename, $buffer, $obj, $clean);
 
 	return $buffer;
 }