--- trunk/bin/irc-logger.pl 2007/12/16 19:03:35 72
+++ trunk/bin/irc-logger.pl 2007/12/16 20:06:47 73
@@ -32,7 +32,8 @@
## CONFIG
-my $HOSTNAME = `hostname`;
+my $HOSTNAME = `hostname -f`;
+chomp($HOSTNAME);
my $NICK = 'irc-logger';
$NICK .= '-dev' if ($HOSTNAME =~ m/llin/);
@@ -59,8 +60,8 @@
my $sleep_on_error = 5;
my $http_port = $NICK =~ m/-dev/ ? 8001 : 8000;
-my $http_hostname = `hostname`;
-chomp( $http_hostname );
+
+my $url = "http://$HOSTNAME:$http_port";
## END CONFIG
@@ -128,7 +129,7 @@
$m =~ s/($escape_re)/$escape{$1}/gs;
$m =~ s#($RE{URI}{HTTP})#e(qq{$1})#egs ||
$m =~ s#\/(\w+)\/#$1#gs;
- $m =~ s#$tag_regex#e(qq{$1})#egs;
+ $m =~ s#$tag_regex#e(qq{$1})#egs;
$m =~ s#\*(\w+)\*#$1#gs;
$m =~ s#_(\w+)_#$1#gs;
@@ -500,7 +501,7 @@
next if (! $tag || $tag =~ m/https?:/i);
push @{ $tags->{$tag} }, $arg->{id};
#warn "+tag $tag: $arg->{id}\n";
- $cloud->add($tag, "?tag=$tag", scalar @{$tags->{$tag}} + 1);
+ $cloud->add($tag, "$url?tag=$tag", scalar @{$tags->{$tag}} + 1);
push @tags, $tag;
}
@@ -526,7 +527,7 @@
}
foreach my $tag (keys %$tags) {
- $cloud->add($tag, "?tag=$tag", scalar @{$tags->{$tag}} + 1);
+ $cloud->add($tag, "$url?tag=$tag", scalar @{$tags->{$tag}} + 1);
}
}
@@ -958,6 +959,8 @@
my ($request, $response) = @_;
$response->code(RC_OK);
+ return RC_OK if $request->uri =~ m/favicon.ico$/;
+
my $q;
if ( $request->method eq 'POST' ) {
@@ -985,19 +988,20 @@
$feed->description( "collects messages which have tags// in them" );
foreach my $m ( @last_tags ) {
- warn dump( $m );
+# 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( );
+ $feed_entry->link( '/#' . $m->{id} );
$feed_entry->issued( DateTime::Format::Flexible->build( $m->{time} ) );
- $feed_entry->summary(
+ #$feed_entry->summary(
+ $feed_entry->content(
'{nick}->( $m->{nick} ) .
# '' . $m->{nick} . ' ' .
$filter->{message}->( $m->{message} ) .
- ']]>'
+ "
\n]]>"
);
$feed_entry->category( join(', ', @{$m->{tags}}) );
$feed->add_entry( $feed_entry );
@@ -1058,7 +1062,7 @@
($l_yyyy,$l_mm) = ($yyyy,$mm);
}
$cal->setcontent($dd, qq{
- $row->{nr}
$row->{len}
+ $row->{nr}
$row->{len}
});
}
@@ -1074,7 +1078,7 @@
fmt => {
date => sub {
my $date = shift || return;
- qq{