From b45980769f1ad2e6f8028e602bac021fac6c01e4 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 22 Jun 2007 23:35:41 +0200 Subject: [PATCH] Revert r147, as planned. --- perl/Sesse/pr0n/Listing.pm | 27 ++++++++++++++------------ perl/Sesse/pr0n/Templates.pm | 36 ----------------------------------- templates/default/listing.xml | 25 ------------------------ 3 files changed, 15 insertions(+), 73 deletions(-) delete mode 100644 templates/default/listing.xml diff --git a/perl/Sesse/pr0n/Listing.pm b/perl/Sesse/pr0n/Listing.pm index 0d63c6d..02ac273 100644 --- a/perl/Sesse/pr0n/Listing.pm +++ b/perl/Sesse/pr0n/Listing.pm @@ -16,27 +16,30 @@ sub handler { } } - +# my $q = $dbh->prepare('SELECT t1.id,t1.date,t1.name FROM events t1 LEFT JOIN images t2 ON t1.id=t2.event WHERE t1.vhost=? GROUP BY t1.id,t1.date,t1.name ORDER BY COALESCE(MAX(t2.date),\'1970-01-01 00:00:00\'),t1.id') or +# dberror($r, "Couldn't list events"); my $q = $dbh->prepare('SELECT event,date,name FROM events e JOIN last_picture_cache c USING (vhost,event) WHERE vhost=? ORDER BY last_picture DESC') or dberror($r, "Couldn't list events"); $q->execute($r->get_server_name) or dberror($r, "Couldn't get events"); - my @events = (); + $r->content_type('text/html; charset=utf-8'); + + Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing')); + $r->print("

$name ($date)

\n"); + Sesse::pr0n::Common::footer($r); + + $q->finish(); return Apache2::Const::OK; } diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm index 8aa0134..8ff1e03 100644 --- a/perl/Sesse/pr0n/Templates.pm +++ b/perl/Sesse/pr0n/Templates.pm @@ -3,11 +3,6 @@ use strict; use warnings; use Sesse::pr0n::Common qw(error dberror); -use XML::SAX::Expat; -use XML::SAX::Writer; -use XML::TemplateSAX::Buffer; -use XML::TemplateSAX::Cleaner; -use XML::TemplateSAX::Handler; BEGIN { use Exporter (); @@ -89,36 +84,5 @@ sub print_template { $r->print($text); } -sub output_page { - my ($r, $page, $params) = @_; - - $r->content_type('text/html; charset=utf-8'); - $params->{'version'} = $Sesse::pr0n::Common::VERSION; - - # build up the XML chain - my $consumer = ModPerlConsumer->new($r); - my $writer = XML::SAX::Writer->new(Output => $consumer); - my $cleaner = XML::TemplateSAX::Cleaner->new(Handler => $writer); - my $filter = XML::TemplateSAX::Handler->new(Handler => $cleaner, Content => $params); - my $parser = XML::SAX::Expat->new(Handler => $filter); - - # kick off the parsing - $parser->parse_string(fetch_template($r, $page)); -} - -# XML consumer for Apache2::Request -package ModPerlConsumer; - -our @ISA = qw( XML::SAX::Writer::ConsumerInterface ); -sub new { - my ($base, $r) = @_; - return $base->SUPER::new($r); -} - -sub output { - my ($self, $text) = @_; - $$self->print($text); -} - 1; diff --git a/templates/default/listing.xml b/templates/default/listing.xml deleted file mode 100644 index 6ad6d76..0000000 --- a/templates/default/listing.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Event listing - - - - -

Event listing

- -

()

- -

- - - -- 2.39.2