so I'll revert in the next commit.
}
}
-# 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");
- $r->content_type('text/html; charset=utf-8');
-
- Sesse::pr0n::Common::header($r, Sesse::pr0n::Templates::fetch_template($r, 'event-listing'));
- $r->print(" <ul>\n");
-
+ my @events = ();
while (my $ref = $q->fetchrow_hashref()) {
my $id = $ref->{'event'};
- my $date = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'date'}));
- my $name = HTML::Entities::encode_entities(Encode::decode_utf8($ref->{'name'}));
-
- $r->print(" <li><a href=\"$id/\">$name</a> ($date)</li>\n");
+ my $date = Encode::decode_utf8($ref->{'date'});
+ my $name = Encode::decode_utf8($ref->{'name'});
+
+ push @events, {
+ 'a' => $name,
+ 'a/href' => "$id/",
+ 'date' => $date
+ };
}
-
- $r->print(" </ul>\n");
- Sesse::pr0n::Common::footer($r);
-
$q->finish();
+
+ Sesse::pr0n::Templates::output_page($r, 'listing.xml', { 'ul' => \@events });
return Apache2::Const::OK;
}
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 ();
$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;
--- /dev/null
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!DOCTYPE
+ html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" xmlns:t="http://template.sesse.net/">
+ <head>
+ <title>Event listing</title>
+ <link rel="stylesheet" href="/pr0n.css" type="text/css" />
+ </head>
+
+ <body>
+ <h1>Event listing</h1>
+
+ <ul t:id="events">
+ <li><a /> (<t:date />)</li>
+ </ul>
+
+ <hr />
+ <p class="footer">
+ pr0n <t:version />, Copyright 2004-2007 <a href="http://www.sesse.net/">Steinar
+ H. Gunderson</a>. All images are copyright their respective owners; please see
+ the <a href="/faq.html" accesskey="5">FAQ</a> for more information.
+ </p>
+ </body>
+</html>