--- loncom/debugging_tools/login_count.pl	2004/09/03 19:51:58	1.1
+++ loncom/debugging_tools/login_count.pl	2005/04/07 01:50:49	1.8
@@ -1,42 +1,44 @@
+use strict;
 use File::Find;
 use POSIX qw(strftime);
 use lib '/home/httpd/lib/perl/';
 use LONCAPA::Configuration;
 use Date::Manip;
-my $perlvar=LONCAPA::Configuration::read_conf('loncapa.conf');
-$|=1;
-find(
-         {
-#          preprocess => \&only_user_activitylog_files,
-#          wanted     => \&print_filename,
-#          wanted     => \&log_metadata,
-          wanted     => \&process_activitylog_file,
-          }, 
-         $perlvar->{'lonUsersDir'}.'/'.$perlvar->{'lonDefDomain'});
-&print_data();
+
+my $start_time=&UnixDate("Aug 30th 00:00:00 2004","%s");
+my @counts=('1','10','100','1000','10000','100000','250000','1000000');
+my @ignored_users=('^itds\d+$');
+
 sub only_user_activitylog_files {
     print (join("\n",@_));
     return 1;
 }
 
-my $start_time=&UnixDate("Aug 30th 00:00:00 2004","%s");
 my %data;
 my $numusers;
+my %machine;
 sub process_activitylog_file {
     if ($File::Find::dir=~m|/\d/\d/\d/|) { return; }
     if ($_ ne 'activity.log') {	return; }
     open(FILE,"<$File::Find::name");
     $numusers++;
     my $user=(split('/',$File::Find::dir))[-1];
+    foreach my $expr (@ignored_users) {
+	if ($user=~/$expr/) { print("\nignoring $user\n"); return; }
+    }
     while (my $line=<FILE>) {
 	if ($line !~ /Login/) { next; }
-	my ($date)=split(':',$line,2);
-	if ($date > 1093838400) { push (@{$data{$date}},$user);	}
+	my ($date,$machine)=split(':',$line,3);
+	if ($date > $start_time) {
+	    push (@{$data{$date}},$user);
+	    $machine{$machine}++;
+	}
     }
     if ($numusers%100 == 0) {
 	print "\b\b\b\b\b\b\b\b\b\b\b\b\b\bDid $user";
     }
 }
+
 sub print_data {
     my $total_login=0;
     my %byday;
@@ -46,10 +48,35 @@ sub print_data {
 	$total_login+=scalar(@{$data{$key}});
 	my $day=strftime('%F',localtime($key));
 	$byday{$day}+=scalar(@{$data{$key}});
+	while ($counts[0] && $total_login >= $counts[0]) {
+	    print("The $counts[0] ($total_login) login was ".
+		  join(', ',@{$data{$key}})."\n");
+            shift(@counts);
+        }
+
     }
     foreach my $key (sort(keys(%byday))) {
     	print("$key -> $byday{$key}\n");
     }
     print("total -> $total_login\n");
+    print("\nMachine Logins\n");
+    foreach my $key (sort(keys(%machine))) {
+	print("$key \t-> $machine{$key}\n");
+    }
+}
+
+$|=1;
+sub main {
+    my $perlvar=LONCAPA::Configuration::read_conf('loncapa.conf');
+    find(
+         {
+#          preprocess => \&only_user_activitylog_files,
+#          wanted     => \&print_filename,
+#          wanted     => \&log_metadata,
+	     wanted     => \&process_activitylog_file,
+	 }, 
+         $perlvar->{'lonUsersDir'}.'/'.$perlvar->{'lonDefDomain'});
+    &print_data();
 }
+&main();