--- trunk/bin/irc-logger.pl 2007/12/20 22:46:16 75
+++ trunk/bin/irc-logger.pl 2008/02/29 22:11:07 83
@@ -59,6 +59,9 @@
my $sleep_on_error = 5;
+# number of last tags to keep in circular buffer
+my $last_x_tags = 50;
+
my $http_port = $NICK =~ m/-dev/ ? 8001 : 8000;
my $url = "http://$HOSTNAME:$http_port";
@@ -483,7 +486,6 @@
=cut
-my $last_x_tags = 5;
my @last_tags;
sub add_tag {
@@ -914,6 +916,11 @@
my $httpd = POE::Component::Server::HTTP->new(
Port => $http_port,
+ PreHandler => {
+ '/' => sub {
+ $_[0]->header(Connection => 'close')
+ }
+ },
ContentHandler => { '/' => \&root_handler },
Headers => { Server => 'irc-logger' },
);
@@ -959,6 +966,9 @@
my ($request, $response) = @_;
$response->code(RC_OK);
+ # this doesn't seem to work, so moved to PreHandler
+ #$response->header(Connection => 'close');
+
return RC_OK if $request->uri =~ m/favicon.ico$/;
my $q;
@@ -973,7 +983,10 @@
my $search = $q->param('search') || $q->param('grep') || '';
- if ($request->url =~ m#/rss#i) {
+ if ($request->url =~ m#/rss(?:/(tags|last-tag)\w*(?:=(\d+))?)?#i) {
+ my $show = lc($1);
+ my $nr = $2;
+
my $type = 'RSS'; # Atom
$response->content_type( 'application/' . lc($type) . '+xml' );
@@ -983,30 +996,63 @@
my $feed = XML::Feed->new( $type );
- $feed->title( "last $last_x_tags from $CHANNEL" );
- $feed->link( $url );
- $feed->description( "collects messages which have tags// in them" );
-
- foreach my $m ( @last_tags ) {
-# warn dump( $m );
- #my $tags = join(' ', @{$m->{tags}} );
+ if ( $show eq 'tags' ) {
+ $nr ||= 50;
+ $feed->title( "tags from $CHANNEL" );
+ $feed->link( "$url/tags" );
+ $feed->description( "tag cloud created from messages on channel $CHANNEL which have tags// in them" );
my $feed_entry = XML::Feed::Entry->new($type);
- $feed_entry->title( $m->{nick} . '@' . $m->{time} );
- $feed_entry->author( $m->{nick} );
- $feed_entry->link( '/#' . $m->{id} );
- $feed_entry->issued( DateTime::Format::Flexible->build( $m->{time} ) );
-
- my $message = $filter->{message}->( $m->{message} );
- $message .= "
\n" unless $message =~ m!<(/p|br/?)>!;
- warn "## message = $message\n";
- from_to( $message, $ENCODING, 'UTF-8' );
+ $feed_entry->title( "$nr tags from $CHANNEL" );
+ $feed_entry->author( $NICK );
+ $feed_entry->link( '/#tags' );
- #$feed_entry->summary(
$feed_entry->content(
- ""
+ qq{}
+ . $cloud->css
+ . qq{}
+ . $cloud->html( $nr )
+ . qq{]]>}
);
- $feed_entry->category( join(', ', @{$m->{tags}}) );
$feed->add_entry( $feed_entry );
+
+ } elsif ( $show eq 'last-tag' ) {
+
+ $nr ||= $last_x_tags;
+ $nr = $last_x_tags if $nr > $last_x_tags;
+
+ $feed->title( "last $nr tagged messages from $CHANNEL" );
+ $feed->link( $url );
+ $feed->description( "collects messages which have tags// in them" );
+
+ foreach my $m ( @last_tags ) {
+# warn dump( $m );
+ #my $tags = join(' ', @{$m->{tags}} );
+ my $feed_entry = XML::Feed::Entry->new($type);
+ $feed_entry->title( $m->{nick} . '@' . $m->{time} );
+ $feed_entry->author( $m->{nick} );
+ $feed_entry->link( '/#' . $m->{id} );
+ $feed_entry->issued( DateTime::Format::Flexible->build( $m->{time} ) );
+
+ my $message = $filter->{message}->( $m->{message} );
+ $message .= "
\n" unless $message =~ m!<(/p|br/?)>!;
+# warn "## message = $message\n";
+ from_to( $message, $ENCODING, 'UTF-8' );
+
+ #$feed_entry->summary(
+ $feed_entry->content(
+ ""
+ );
+ $feed_entry->category( join(', ', @{$m->{tags}}) );
+ $feed->add_entry( $feed_entry );
+
+ $nr--;
+ last if $nr <= 0;
+
+ }
+
+ } else {
+ warn "!! unknown rss request for $show\n";
+ return RC_DENY;
}
$response->content( $feed->as_xml );
@@ -1020,18 +1066,21 @@
$response->content_type("text/html; charset=$ENCODING");
my $html =
- qq{$NICK} .
- qq{
+ qq{$NICK}
+ . qq{
- } .
- $cloud->html(500) .
- qq{};
- if ($request->url =~ m#/history#) {
+ }
+ . $cloud->html(500)
+ . qq{
};
+
+ if ($request->url =~ m#/tags?#) {
+ # nop
+ } elsif ($request->url =~ m#/history#) {
my $sth = $dbh->prepare(qq{
select date(time) as date,count(*) as nr,sum(length(message)) as len
from log
@@ -1063,9 +1112,9 @@
$cal->weekdays('MON','TUE','WED','THU','FRI');
($l_yyyy,$l_mm) = ($yyyy,$mm);
}
- $cal->setcontent($dd, qq{
+ $cal->setcontent($dd, qq[
$row->{nr}
$row->{len}
- });
+ ]);
}
$html .= qq{
} . $cal->as_HTML() . qq{ | };