--- trunk/bin/irc-logger.pl 2008/02/20 19:37:34 78
+++ trunk/bin/irc-logger.pl 2008/02/20 20:33:03 81
@@ -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 {
@@ -973,9 +975,9 @@
my $search = $q->param('search') || $q->param('grep') || '';
- if ($request->url =~ m#/rss(?:/(tags)(?:=(\d+))?)?#i) {
+ if ($request->url =~ m#/rss(?:/(tags|last-tag)\w*(?:=(\d+))?)?#i) {
my $show = lc($1);
- my $arg = $2 || 50;
+ my $nr = $2;
my $type = 'RSS'; # Atom
@@ -987,11 +989,12 @@
my $feed = XML::Feed->new( $type );
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( "$arg tags from $CHANNEL" );
+ $feed_entry->title( "$nr tags from $CHANNEL" );
$feed_entry->author( $NICK );
$feed_entry->link( '/#tags' );
@@ -999,14 +1002,17 @@
qq{}
. $cloud->css
. qq{}
- . $cloud->html( $arg )
+ . $cloud->html( $nr )
. qq{]]>}
);
$feed->add_entry( $feed_entry );
- } else {
+ } elsif ( $show eq 'last-tag' ) {
- $feed->title( "last $last_x_tags from $CHANNEL" );
+ $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" );
@@ -1021,7 +1027,7 @@
my $message = $filter->{message}->( $m->{message} );
$message .= "
\n" unless $message =~ m!<(/p|br/?)>!;
- warn "## message = $message\n";
+# warn "## message = $message\n";
from_to( $message, $ENCODING, 'UTF-8' );
#$feed_entry->summary(
@@ -1030,7 +1036,15 @@
);
$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 );
@@ -1090,9 +1104,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{