--- trunk/bin/irc-logger.pl	2007/04/21 12:10:23	61
+++ trunk/bin/irc-logger.pl	2007/09/29 14:11:55	68
@@ -75,6 +75,8 @@
 use DateTime;
 use URI::Escape;
 use Data::Dump qw/dump/;
+use DateTime::Format::ISO8601;
+use Carp qw/confess/;
 
 my $use_twitter = 1;
 eval { require Net::Twitter; };
@@ -87,6 +89,10 @@
 	'log:s' => \$log_path,
 );
 
+$SIG{__DIE__} = sub {
+	confess "fatal error";
+};
+
 open(STDOUT, '>', $log_path) || warn "can't redirect log to $log_path: $!";
 
 sub _log {
@@ -229,14 +235,16 @@
 sub get_from_log {
 	my $args = {@_};
 
-	$args->{fmt} ||= {
-		date => '[%s] ',
-		time => '{%s} ',
-		time_channel => '{%s %s} ',
-		nick => '%s: ',
-		me_nick => '***%s ',
-		message => '%s',
-	};
+	if ( ! $args->{fmt} ) {
+		$args->{fmt} = {
+			date => '[%s] ',
+			time => '{%s} ',
+			time_channel => '{%s %s} ',
+			nick => '%s: ',
+			me_nick => '***%s ',
+			message => '%s',
+		};
+	}
 
 	my $sql_message = qq{
 		select
@@ -259,27 +267,49 @@
 
 	my $sql = $context ? $sql_context : $sql_message;
 
-	$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} if ($args->{limit});
+	sub check_date {
+		my $date = shift || return;
+		my $new_date = eval { DateTime::Format::ISO8601->parse_datetime( $date )->ymd; };
+		if ( $@ ) {
+			warn "invalid date $date\n"; 
+			$new_date = DateTime->now->ymd;
+		}
+		return $new_date;
+	}
+
+	my @where;
+	my @args;
 
-	my $sth = $dbh->prepare( $sql );
 	if (my $search = $args->{search}) {
 		$search =~ s/^\s+//;
 		$search =~ s/\s+$//;
-		$sth->execute( ( '%' . $search . '%' ) x 2 );
-		_log "search for '$search' returned ", $sth->rows, " results ", $context || '';
-	} elsif (my $tag = $args->{tag}) {
-		$sth->execute();
-		_log "tag '$tag' returned ", $sth->rows, " results ", $context || '';
-	} elsif (my $date = $args->{date}) {
-		$sth->execute($date);
-		_log "found ", $sth->rows, " messages for date $date ", $context || '';
-	} else {
-		$sth->execute();
+		push @where, 'message ilike ? or nick ilike ?';
+		push @args, ( ( '%' . $search . '%' ) x 2 );
+		_log "search for '$search'";
+	}
+
+	if ($args->{tag} && $tags->{ $args->{tag} }) {
+		push @where, 'id in (' . join(',', @{ $tags->{ $args->{tag} } }) . ')';
+		_log "search for tags $args->{tag}";
 	}
+
+	if (my $date = $args->{date} ) {
+		$date = check_date( $date );
+		push @where, 'date(time) = ?';
+		push @args, $date;
+		_log "search for date $date";
+	}
+
+	$sql .= " where " . join(" and ", @where) if @where;
+
+	$sql .= " order by log.time desc";
+	$sql .= " limit " . $args->{limit} if ($args->{limit});
+
+	#warn "### sql: $sql ", dump( @args );
+
+	my $sth = $dbh->prepare( $sql );
+	$sth->execute( @args );
+
 	my $last_row = {
 		date => '',
 		time => '',
@@ -846,6 +876,8 @@
 .col-3 { background: #ff9999 }
 .col-4 { background: #ff66ff }
 */
+.calendar { border: 1px solid red; width: 100%; }
+.month { border: 0px; width: 100%; }
 _END_OF_STYLE_
 
 my $max_color = 4;
@@ -898,33 +930,47 @@
 		qq{<p>};
 	if ($request->url =~ m#/history#) {
 		my $sth = $dbh->prepare(qq{
-			select date(time) as date,count(*) as nr
+			select date(time) as date,count(*) as nr,sum(length(message)) as len
 				from log
 				group by date(time)
 				order by date(time) desc
 		});
 		$sth->execute();
 		my ($l_yyyy,$l_mm) = (0,0);
+		$html .= qq{<table class="calendar"><tr>};
 		my $cal;
+		my $ord = 0;
 		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);
+				if ( $cal ) {
+					$html .= qq{<td valign="top">} . $cal->as_HTML() . qq{</td>};
+					$ord++;
+					$html .= qq{</tr><tr>} if ( $ord % 3 == 0 );
+				}
 				$cal = new HTML::CalendarMonthSimple('month'=>$mm,'year'=>$yyyy);
-				$cal->border(2);
+				$cal->border(1);
+				$cal->width('30%');
+				$cal->cellheight('5em');
+				$cal->tableclass('month');
+				#$cal->cellclass('day');
+				$cal->sunday('SUN');
+				$cal->saturday('SAT');
+				$cal->weekdays('MON','TUE','WED','THU','FRI');
 				($l_yyyy,$l_mm) = ($yyyy,$mm);
 			}
 			$cal->setcontent($dd, qq{
-				<a href="/?date=$row->{date}">$row->{nr}</a>
+				<a href="/?date=$row->{date}">$row->{nr}</a><br/>$row->{len}
 			});
+			
 		}
-		$html .= $cal->as_HTML() if ($cal);
+		$html .= qq{<td valign="top">} . $cal->as_HTML() . qq{</td></tr></table>};
 
 	} else {
 		$html .= join("</p><p>",
 			get_from_log(
-				limit => $q->param('last') || $q->param('date') ? undef : 100,
+				limit => ( $q->param('last') || $q->param('date') ) ? undef : 100,
 				search => $search || undef,
 				tag => $q->param('tag') || undef,
 				date => $q->param('date') || undef,