X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl-sax%2FXML%2FTemplateSAX.pm;h=e5e6e400fe629eca73edf539c65decdcd289c486;hb=19ada1f1ca1872cfe3210d62b0633702b8d46f51;hp=5edeea69f535b3af9f669310834037709b24a5ee;hpb=f91b0828ee341cb09381e535538f5c8865486731;p=xml-template

diff --git a/perl-sax/XML/TemplateSAX.pm b/perl-sax/XML/TemplateSAX.pm
index 5edeea6..e5e6e40 100644
--- a/perl-sax/XML/TemplateSAX.pm
+++ b/perl-sax/XML/TemplateSAX.pm
@@ -3,7 +3,7 @@
 #
 # SAX version of XML::Template. Advantages over DOM: Doesn't have to load
 # the entire thing into memory, and you can chain filters. Disadvantages:
-# Slightly kludgier interface.
+# Slightly kludgier interface, and you won't get a DOM tree out.
 #
 # Differences from the DOM version:
 # 
@@ -11,8 +11,13 @@
 #   in the stream, usually between a parser and a writer (ie.
 #   parser -> XML::TemplateSAX::Handler -> writer). process_file works as
 #   before, but it returns a _string_, not a DOM tree.
-# - You can no longer insert a DOM tree. Instead, what you have is -- FIXME:
-#   figure out this :-)
+# - 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. (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;
@@ -25,27 +30,60 @@ 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 = '';
 
-	# FIXME: hardcoding expat = not good?
-	$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?
 	$parser = XML::SAX::Expat->new(Handler => $filter);
 	$parser->parse_file($filename);
 
 	return $str;
 }
 
+sub process_file {
+	my ($filename, $obj, $clean) = @_;
+
+	my $str = '';
+	my $writer = XML::SAX::Writer->new(Output => \$str);
+
+	process_file_to_handler($filename, $writer, $obj, $clean);
+
+	return $str;
+}
+
+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;
+}
+
+sub alternate {
+	my ($tag, $array, @elems) = @_;
+
+	my $i = 0;
+	my $num = scalar @elems;
+
+	for my $ref (@$array) {
+		if (defined($ref)) {
+			$ref->{$tag} = $elems[$i++ % $num];
+		}
+	}
+
+	return $array;
+}
+
 1;