--- trunk/irc-logger.pl	2006/06/25 17:48:33	38
+++ trunk/irc-logger.pl	2007/02/02 21:37:52	42
@@ -50,6 +50,8 @@
 my $ENCODING = 'ISO-8859-2';
 my $TIMESTAMP = '%Y-%m-%d %H:%M:%S';
 
+my $sleep_on_error = 5;
+
 ## END CONFIG
 
 
@@ -126,6 +128,7 @@
 		}
 	},
 	context => 5,
+	full_rows => 1,
  );
 
 Order is important. Fields are first passed through C<filter> (if available) and
@@ -133,6 +136,9 @@
 
 C<context> defines number of messages around each search hit for display.
 
+C<full_rows> will return database rows for each result with C<date>, C<time>, C<channel>,
+C<me>, C<nick> and C<message> keys.
+
 =cut
 
 sub get_from_log {
@@ -202,6 +208,13 @@
 		unshift @rows, $row;
 	}
 
+	# normalize nick names
+	map {
+		$_->{nick} =~ s/^_*(.*?)_*$/$1/
+	} @rows;
+
+	return @rows if ($args->{full_rows});
+
 	my @msgs = (
 		"Showing " . ($#rows + 1) . " messages..."
 	);
@@ -258,9 +271,9 @@
 		my $append = 1;
 
 		my $nick = $row->{nick};
-		if ($nick =~ s/^_*(.*?)_*$/$1/) {
-			$row->{nick} = $nick;
-		}
+#		if ($nick =~ s/^_*(.*?)_*$/$1/) {
+#			$row->{nick} = $nick;
+#		}
 
 		if ($last_row->{nick} ne $nick) {
 			# obfu way to find format for me_nick if needed or fallback to default
@@ -476,18 +489,25 @@
 			my $nr = $1 || 10;
 
 			my $sth = $dbh->prepare(qq{
-				select nick,count(*) from log group by nick order by count desc limit $nr
+				select
+					nick,
+					count(*) as count,
+					sum(length(message)) as len
+				from log
+				group by nick
+				order by len desc,count desc
+				limit $nr
 			});
 			$sth->execute();
 			$res = "Top $nr users: ";
 			my @users;
 			while (my $row = $sth->fetchrow_hashref) {
-				push @users,$row->{nick} . ': ' . $row->{count};
+				push @users,$row->{nick} . ': ' . $row->{count} . '/' . $row->{len} . '=' . sprintf("%.2f", $row->{len}/$row->{count});
 			}
 			$res .= join(" | ", @users);
 		} elsif ($msg =~ m/^last.*?\s*(\d*)/i) {
 
-			foreach my $res (get_from_log( limit => $1 )) {
+			foreach my $res (get_from_log( limit => ($1 || 100) )) {
 				print "last: $res\n";
 				from_to($res, $ENCODING, 'UTF-8');
 				$_[KERNEL]->post( $IRC_ALIAS => privmsg => $nick, $res );
@@ -510,6 +530,35 @@
 
 			$res = '';
 
+		} elsif ($msg =~ m/^(?:count|poll)\s+(.*)(?:\s+(\d+))?\s*$/i) {
+
+			my ($what,$limit) = ($1,$2);
+			$limit ||= 100;
+
+			my $stat;
+
+			foreach my $res (get_from_log(
+					limit => $limit,
+					search => $what,
+					full_rows => 1,
+				)) {
+				while ($res->{message} =~ s/\Q$what\E(\+|\-)//) {
+					$stat->{vote}->{$1}++;
+					$stat->{from}->{ $res->{nick} }++;
+				}
+			}
+
+			my @nicks;
+			foreach my $nick (sort { $stat->{from}->{$a} cmp $stat->{from}->{$b} } keys %{ $stat->{from} }) {
+				push @nicks, $nick . $stat->{from}->{$nick} == 1 ? '' :
+					"(" . $stat->{from}->{$nick} . ")";
+			}
+
+			$res =
+				"+ " . ( $stat->{vote}->{'+'} || 0 ) . " : " .
+				"- " . ( $stat->{vote}->{'-'} || 0 ) .
+				" from " . ( join(", ", @nicks) || 'nobody' );
+
 		}
 
 		if ($res) {
@@ -533,6 +582,15 @@
 		warn "## indetify $NICK\n";
 		$_[KERNEL]->post( $IRC_ALIAS => privmsg => 'nickserv', "IDENTIFY $NICK" );
 	},
+	irc_disconnected => sub {
+		warn "## disconnected, reconnecting again\n";
+		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+	},
+	irc_socketerr => sub {
+		warn "## socket error... sleeping for $sleep_on_error seconds and retry";
+		sleep($sleep_on_error);
+		$_[KERNEL]->post($IRC_ALIAS => connect => $CONNECT);
+	},
 #	irc_433 => sub {
 #		print "# irc_433: ",$_[ARG1], "\n";
 #		warn "## indetify $NICK\n";