- added top3 irctextcounter stats

[infobot.git] / src / core.pl

diff --git a/src/core.pl b/src/core.pl
index de587d566ff395b4cbed2c0abe737f76b1faf011..b49d9b2dbbbfa7dec62356dfab07a30bdb3806eb 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -19,9 +19,9 @@ use vars qw(
        $flag_quit $msgType
        $utime_userfile $wtime_userfile $ucount_userfile
        $utime_chanfile $wtime_chanfile $ucount_chanfile
-       $pubsize $pubcount $pubtime $pubsleep
-       $msgsize $msgcount $msgtime $msgsleep
-       $notsize $notcount $nottime $notsleep
+       $pubsize $pubcount $pubtime
+       $msgsize $msgcount $msgtime
+       $notsize $notcount $nottime
 );
 
 # dynamic hash.
@@ -59,13 +59,13 @@ $ucount_chanfile = 0;
 ### more variables...
 $msgtime       = time();
 $msgsize       = 0;
-$msgcount      = $msgsleep     = 0;
+$msgcount      = 0;
 $pubtime       = 0;
 $pubsize       = 0;
-$pubcount      = $pubsleep     = 0;
+$pubcount      = 0;
 $nottime       = 0;
 $notsize       = 0;
-$notcount      = $notsleep     = 0;
+$notcount      = 0;
 ###
 if ( -d "CVS" ) {
     use POSIX qw(strftime);
@@ -201,6 +201,8 @@ sub IsChanConf {
        return 0;
     }
 
+    $chan      ||= "_default";
+
     my $old = $chan;
     if ($chan =~ tr/A-Z/a-z/) {
        &WARN("IsChanConf: lowercased chan. ($old)");
@@ -268,23 +270,31 @@ sub IsChanConf {
 #  About: Retrieve value for 'param' value in current/default chan.
 # Return: scalar for success, undef for failure.
 sub getChanConf {
-    my($param,$chan)   = @_;
+    my($param,$c)      = @_;
 
     if (!defined $param) {
        &WARN("param == NULL.");
        return 0;
     }
 
-    $chan      ||= "_default";
-    my @c      = grep /^$chan$/i, keys %chanconf;
+    # this looks evil... 
+    if (0 and !defined $chan) {
+       &DEBUG("gCC: ok !chan... doing _default instead.");
+    }
+
+    $c         ||= $chan;
+    $c         ||= "_default";
+    $c         = "_default" if ($c eq "*");    # fix!
+    my @c      = grep /^$c$/i, keys %chanconf;
 
     if (@c) {
-       if ($c[0] ne $chan) {
+       if (0 and $c[0] ne $c) {
            &WARN("c ne chan ($c[0] ne $chan)");
        }
        return $chanconf{$c[0]}{$param};
     }
 
+#    &DEBUG("gCC: returning _default... ");
     return $chanconf{"_default"}{$param};
 }
 
@@ -375,6 +385,7 @@ sub setup {
     $param{tempDir} =~ s#\~/#$ENV{HOME}/#;
 
     &status("Initial memory usage: $memusage kB");
+    &status("-------------------------------------------------------");
 }
 
 sub setupConfig {
@@ -421,7 +432,7 @@ sub startup {
 
 sub shutdown {
     # reverse order of &setup().
-    &DEBUG("shutdown called.");
+    &status("--- shutdown called.");
 
     $ident ||= "blootbot";     # hack.