--- trunk/bin/irc-logger.pl	2007/12/16 18:51:05	71
+++ trunk/bin/irc-logger.pl	2008/02/07 17:09:54	76
@@ -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{<a href="$1">$1</a>})#egs ||
 		$m =~ s#\/(\w+)\/#<i>$1</i>#gs;
-		$m =~ s#$tag_regex#e(qq{<a href="?tag=$1" class="tag">$1</a>})#egs;
+		$m =~ s#$tag_regex#e(qq{<a href="$url?tag=$1" class="tag">$1</a>})#egs;
 		$m =~ s#\*(\w+)\*#<b>$1</b>#gs;
 		$m =~ s#_(\w+)_#<u>$1</u>#gs;
 
@@ -500,14 +501,14 @@
 		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;
 
 	}
 
 	if ( @tags ) {
-		shift @last_tags if $#last_tags == $last_x_tags;
-		push @last_tags, { tags => [ @tags ], %$arg };
+		pop @last_tags if $#last_tags == $last_x_tags;
+		unshift @last_tags, { tags => [ @tags ], %$arg };
 	}
 
 }
@@ -519,14 +520,14 @@
 =cut
 
 sub seed_tags {
-	my $sth = $dbh->prepare(qq{ select id,message,nick,me,time from log where message like '%//%' });
+	my $sth = $dbh->prepare(qq{ select id,message,nick,me,time from log where message like '%//%' order by time asc });
 	$sth->execute;
 	while (my $row = $sth->fetchrow_hashref) {
 		add_tag( %$row );
 	}
 
 	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' ) {
@@ -972,33 +975,35 @@
 
 	if ($request->url =~ m#/rss#i) {
 		my $type = 'RSS';	# Atom
-		my $url = "http://$http_hostname:$http_port";
 
-		$response->content_type("application/$type+xml");
+		$response->content_type( 'application/' . lc($type) . '+xml' );
 
 		my $html = '<!-- error -->';
-		warn "create $type feed from ",dump( @last_tags );
+		#warn "create $type feed from ",dump( @last_tags );
 
 		my $feed = XML::Feed->new( $type );
 
 		$feed->title( "last $last_x_tags from $CHANNEL" );
-		$feed->link( "http://$http_hostname:$http_port" );
+		$feed->link( $url );
 		$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(
-				'<![CDATA[' .
-#				$filter->{nick}->( $m->{nick} ) .
-#				'<tt>' . $m->{nick} . '</tt> ' .
-				$filter->{message}->( $m->{message} ) .
-				']]>'
+
+			my $message = $filter->{message}->( $m->{message} );
+			$message .= "<br/>\n" unless $message =~ m!<(/p|br/?)>!;
+			warn "## message = $message\n";
+			from_to( $message, $ENCODING, 'UTF-8' );
+
+			#$feed_entry->summary(
+			$feed_entry->content(
+				"<![CDATA[$message]]>"
 			);
 			$feed_entry->category( join(', ', @{$m->{tags}}) );
 			$feed->add_entry( $feed_entry );
@@ -1026,7 +1031,10 @@
 		} .
 		$cloud->html(500) .
 		qq{<p>};
-	if ($request->url =~ m#/history#) {
+
+	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
@@ -1059,7 +1067,7 @@
 				($l_yyyy,$l_mm) = ($yyyy,$mm);
 			}
 			$cal->setcontent($dd, qq{
-				<a href="/?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
+				<a href="$url?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
 			});
 			
 		}
@@ -1075,7 +1083,7 @@
 				fmt => {
 					date => sub {
 						my $date = shift || return;
-						qq{<hr/><div class="date"><a href="/?date=$date">$date</a></div>};
+						qq{<hr/><div class="date"><a href="$url?date=$date">$date</a></div>};
 					},
 					time => '<span class="time">%s</span> ',
 					time_channel => '<span class="channel">%s %s</span> ',
@@ -1094,6 +1102,7 @@
 	</body></html>};
 
 	$response->content( $html );
+	warn "<< ", $request->method, " ", $request->uri, " created ", length($html), " bytes\n";
 	return RC_OK;
 }