--- trunk/irc-logger.pl	2006/06/16 21:28:46	30
+++ trunk/irc-logger.pl	2006/06/25 00:10:13	35
@@ -18,13 +18,17 @@
 
 ## CONFIG
 
+my $HOSTNAME = `hostname`;
+
 my $NICK = 'irc-logger';
+$NICK .= '-dev' if ($HOSTNAME =~ m/llin/);
 my $CONNECT =
   {Server => 'irc.freenode.net',
    Nick => $NICK,
    Ircname => "try /msg $NICK help",
   };
 my $CHANNEL = '#razmjenavjestina';
+$CHANNEL = '#irc-logger' if ($HOSTNAME =~ m/llin/);
 my $IRC_ALIAS = "log";
 
 my %FOLLOWS =
@@ -36,6 +40,7 @@
 my $DSN = 'DBI:Pg:dbname=' . $NICK;
 
 my $ENCODING = 'ISO-8859-2';
+my $TIMESTAMP = '%Y-%m-%d %H:%M:%S';
 
 ## END CONFIG
 
@@ -48,6 +53,8 @@
 use Regexp::Common qw /URI/;
 use CGI::Simple;
 use HTML::TagCloud;
+use POSIX qw/strftime/;
+use HTML::CalendarMonthSimple;
 
 my $dbh = DBI->connect($DSN,"","", { RaiseError => 1, AutoCommit => 1 }) || die $DBI::errstr;
 
@@ -83,6 +90,7 @@
 });
 
 my $tags;
+my $tag_regex = '\b([\w-_]+)//';
 
 =head2 get_from_log
 
@@ -115,8 +123,6 @@
 sub get_from_log {
 	my $args = {@_};
 
-	$args->{limit} ||= 10;
-
 	$args->{fmt} ||= {
 		date => '[%s] ',
 		time => '{%s} ',
@@ -149,8 +155,9 @@
 
 	$sql .= " where message ilike ? or nick ilike ? " if ($args->{search});
 	$sql .= " where id in (" . join(",", @{ $tags->{ $args->{tag} } }) . ") " if ($args->{tag} && $tags->{ $args->{tag} });
+	$sql .= " where date(time) = ? " if ($args->{date});
 	$sql .= " order by log.time desc";
-	$sql .= " limit " . $args->{limit};
+	$sql .= " limit " . $args->{limit} if ($args->{limit});
 
 	my $sth = $dbh->prepare( $sql );
 	if (my $search = $args->{search}) {
@@ -161,6 +168,9 @@
 	} elsif (my $tag = $args->{tag}) {
 		$sth->execute();
 		warn "tag '$tag' returned ", $sth->rows, " results ", $context || '', "\n";
+	} elsif (my $date = $args->{date}) {
+		$sth->execute($date);
+		warn "found ", $sth->rows, " messages for date $date ", $context || '', "\n";
 	} else {
 		$sth->execute();
 	}
@@ -205,19 +215,29 @@
 		}
 	}
 
+	# sprintf which can take coderef as first parametar
+	sub cr_sprintf {
+		my $fmt = shift || return;
+		if (ref($fmt) eq 'CODE') {
+			$fmt->(@_);
+		} else {
+			sprintf($fmt, @_);
+		}
+	}
+
 	foreach my $row (@rows) {
 
 		$row->{time} =~ s#\.\d+##;
 
 		my $msg = '';
 
-		$msg = sprintf($args->{fmt}->{date}, $row->{date}) . ' ' if ($last_row->{date} ne $row->{date});
+		$msg = cr_sprintf($args->{fmt}->{date}, $row->{date}) . ' ' if ($last_row->{date} ne $row->{date});
 		my $t = $row->{time};
 
 		if ($last_row->{channel} ne $row->{channel}) {
-			$msg .= sprintf($args->{fmt}->{time_channel}, $t, $row->{channel});
+			$msg .= cr_sprintf($args->{fmt}->{time_channel}, $t, $row->{channel});
 		} else {
-			$msg .= sprintf($args->{fmt}->{time}, $t);
+			$msg .= cr_sprintf($args->{fmt}->{time}, $t);
 		}
 
 		my $append = 1;
@@ -234,19 +254,19 @@
 
 			$nick = $args->{filter}->{nick}->($nick) if (ref($args->{filter}->{nick}) eq 'CODE');
 
-			$msg .= sprintf( $fmt, $nick );
+			$msg .= cr_sprintf( $fmt, $nick );
 			$append = 0;
 		}
 
 		$args->{fmt}->{message} ||= '%s';
 		if (ref($args->{filter}->{message}) eq 'CODE') {
-			$msg .= sprintf($args->{fmt}->{message},
+			$msg .= cr_sprintf($args->{fmt}->{message},
 				$args->{filter}->{message}->(
 					$row->{message}
 				)
 			);
 		} else {
-			$msg .= sprintf($args->{fmt}->{message}, $row->{message});
+			$msg .= cr_sprintf($args->{fmt}->{message}, $row->{message});
 		}
 
 		if ($append && @msgs) {
@@ -267,8 +287,7 @@
 
 POE::Component::IRC->new($IRC_ALIAS);
 
-POE::Session->create
-  (inline_states =>
+POE::Session->create( inline_states =>
    {_start => sub {      
 		$_[KERNEL]->post($IRC_ALIAS => register => 'all');
 		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
@@ -394,30 +413,13 @@
 #		warn "## indetify $NICK\n";
 #		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
 #	},
-	irc_372 => sub {
-		print "MOTD: ", $_[ARG1], "\n";
-	},
-	irc_snotice => sub {
-		print "(server notice): ", $_[ARG0], "\n";
-	},
-    (map
-     {
-       ;"irc_$_" => sub { }}
-     qw(
-		)),
-#	join
-#     	ctcp_version
-#	connected snotice ctcp_action ping notice mode part quit
-#	001 002 003 004 005
-#	250 251 252 253 254 265 266
-#	332 333 353 366 372 375 376
-#	477
     _child => sub {},
     _default => sub {
-      printf "%s: session %s caught an unhandled %s event.\n",
-        scalar localtime(), $_[SESSION]->ID, $_[ARG0];
-      print "The $_[ARG0] event was given these parameters: ",
-        join(" ", map({"ARRAY" eq ref $_ ? "[@$_]" : "$_"} @{$_[ARG1]})), "\n";
+		printf "%s #%s %s %s\n",
+			strftime($TIMESTAMP,localtime()), $_[SESSION]->ID, $_[ARG0],
+			ref($_[ARG1]) eq "ARRAY"	?	join(",", map { ref($_) eq "ARRAY" ? join(";", @{$_}) : $_ } @{ $_[ARG1] })	:
+			$_[ARG1]					?	$_[ARG1]					:
+			"";
       0;                        # false for signals
     },
     my_add => sub {
@@ -501,10 +503,12 @@
 	my $m = $arg->{message};
 	from_to('UTF-8', 'iso-8859-2', $m) if (is_utf8($m));
 
-	while ($m =~ s#\b([\w-_]+)//##s) {
+	while ($m =~ s#$tag_regex##s) {
 		my $tag = $1;
 		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);
 	}
 }
 
@@ -551,6 +555,9 @@
 .col-2 { background: #99ff99 }
 .col-3 { background: #ff9999 }
 .col-4 { background: #ff66ff }
+a:link.tag, a:visited.tag { border: 1px dashed #ccc; backgound: #ccc; text-decoration: none }
+a:hover.tag { border: 1px solid #eee }
+hr { border: 1px dashed #ccc; height: 1px; clear: both; }
 _END_OF_STYLE_
 
 my $max_color = 4;
@@ -574,25 +581,55 @@
 
 	my $search = $q->param('search') || $q->param('grep') || '';
 
-	$response->content(
+	my $html =
 		qq{<html><head><title>$NICK</title><style type="text/css">$style} .
 		$cloud->css .
 		qq{</style></head><body>} .
 		qq{
-		<form method="post" class="search">
+		<form method="post" class="search" action="/">
 		<input type="text" name="search" value="$search" size="10">
 		<input type="submit" value="search">
 		</form>
 		} .
-		qq{<div>} . $cloud->html(500) . qq{</div>} .
-		qq{<p>} .
-		join("</p><p>",
+		$cloud->html(500) .
+		qq{<p>};
+	if ($request->url =~ m#/history#) {
+		my $sth = $dbh->prepare(qq{
+			select date(time) as date,count(*) as nr
+				from log
+				group by date(time)
+				order by date(time) desc
+		});
+		$sth->execute();
+		my ($l_yyyy,$l_mm) = (0,0);
+		my $cal;
+		while (my $row = $sth->fetchrow_hashref) {
+			# this is probably PostgreSQL specific, expects ISO date
+			my ($yyyy,$mm,$dd) = split(/-/, $row->{date});
+			if ($yyyy != $l_yyyy || $mm != $l_mm) {
+				$html .= $cal->as_HTML() if ($cal);
+				$cal = new HTML::CalendarMonthSimple('month'=>$mm,'year'=>$yyyy);
+				$cal->border(2);
+				($l_yyyy,$l_mm) = ($yyyy,$mm);
+			}
+			$cal->setcontent($dd, qq{
+				<a href="/?date=$row->{date}">$row->{nr}</a>
+			});
+		}
+		$html .= $cal->as_HTML() if ($cal);
+
+	} else {
+		$html .= join("</p><p>",
 			get_from_log(
-				limit => $q->param('last') || 100,
+				limit => $q->param('last') || $q->param('date') ? undef : 100,
 				search => $search || undef,
 				tag => $q->param('tag') || undef,
+				date => $q->param('date') || undef,
 				fmt => {
-					date => '<hr size="1" style="clear: both;"/><div class="date">%s</div> ',
+					date => sub {
+						my $date = shift || return;
+						qq{<hr/><div class="date"><a href="/?date=$date">$date</a></div> '};
+					},
 					time => '<span class="time">%s</span> ',
 					time_channel => '<span class="channel">%s %s</span> ',
 					nick => '%s:&nbsp;',
@@ -604,6 +641,7 @@
 						my $m = shift || return;
 						$m =~ s/($escape_re)/$escape{$1}/gs;
 						$m =~ s#($RE{URI}{HTTP})#<a href="$1">$1</a>#gs;
+						$m =~ s#$tag_regex#<a href="?tag=$1" class="tag">$1</a>#g;
 						return $m;
 					},
 					nick => sub {
@@ -618,9 +656,15 @@
 					},
 				},
 			)
-		) .
-		qq{</p></body></html>}
-	);
+		);
+	}
+
+	$html .= qq{</p>
+	<hr/>
+	<p>See <a href="/history">history</a> of all messages.</p>
+	</body></html>};
+
+	$response->content( $html );
 	return RC_OK;
 }