+15Jan06=======================================================================
+1. Fix some obviously long standing problems with create_sysop.pl and also
+with initialising the User file.
+2. Fixed the problem with certain things not being shown in sh/log (because of
+a regex that rejected too many things).
+3. Speeded up sh/log quite a bit at the same time.
14Jan06=======================================================================
1. undo frequency rounding change, it causes more problems than it solves.
11Jan06=======================================================================
my $drop = 0;
$nossid =~ s/-\d+$//;
if ($DXProt::badspotter->in($nossid)) {
- LogDbg('DXCommand', "bad spotter ($from) made announcement: $line");
+ LogDbg('DXCommand', "bad spotter ($self->{call}) made announcement: $line");
$drop++;
}
use IO::File;
use DXVars;
-#use DXDebug ();
+use DXDebug qw(dbg isdbg);
use DXUtil;
use DXLog;
use Julian;
+use RingBuf;
use strict;
{
my $fcb = $DXLog::log;
my $from = shift || 0;
- my $to = shift || 20;
+ my $to = shift || 10;
my $jdate = $fcb->unixtoj(shift);
my $pattern = shift;
my $who = uc shift;
if ($pattern) {
$hint = "m{\\Q$pattern\\E}i";
} else {
- $hint = "!m{ann|rcmd|talk|chat}";
+ $hint = "!m{\\^(?:ann|rcmd|talk|chat)\\^}";
}
if ($who) {
$hint .= ' && ' if $hint;
$eval = qq(while (<\$fh>) {
$hint;
chomp;
- push \@tmp, \$_;
+ \$ring->write(\$_);
} );
+ if (isdbg('search')) {
+ dbg("sh/log hint: $hint");
+ dbg("sh/log eval: $eval");
+ }
+
$fcb->close; # close any open files
my $fh = $fcb->open($jdate);
L1: for (;@in < $to;) {
my $ref;
+ my $ring = RingBuf->new($tot);
+
if ($fh) {
my @tmp;
eval $eval; # do the search on this file
return ("Log search error", $@) if $@;
- @in = (@tmp, @in);
- if (@in > $to) {
- @in = splice @in, -$to, $to;
- last L1;
- }
+
+ @in = ($ring->readall, @in);
+ last L1 if @in > $tot;
}
+
$fh = $fcb->openprev(); # get the next file
last if !$fh;
}
return @out;
}
+
#
# the standard log printing interpreting routine.
#
$ufn = "$fn.v3";
$v3 = 1;
- $convert++ unless -e $ufn;
+ $convert++ if -e "$fn.v2" && !-e $ufn;
}
if ($mode) {
$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
}
+ die "Cannot open $ufn ($!)\n" unless $dbm;
+
$lru = LRU->newbase("DXUser", $lrusize);
# do a conversion if required
- if ($convert) {
+ if ($dbm && $convert) {
my ($key, $val, $action, $count, $err) = ('','',0,0,0);
my %oldu;
{
return unless $main::do_xml;
- eval { require XML::Simple; };
- unless ($@) {
+ eval { require XML::Simple };
+ eval { require XML::SAX } unless $@;
+ eval { require XML::SAX::Expat } unless $@;
+ if ($@) {
+ LogDbg('err', "do_xml was set to 1 and the XML routines failed to load ($@)");
+ $main::do_xml = 0;
+ } else {
+ $XML::Simple::PREFERRED_PARSER = 'XML::SAX::Expat';
import XML::Simple;
$DXProt::handle_xml = 1;
- $xs = new XML::Simple();
+ $xs = new XML::Simple(Cache=>[]);
}
undef $@;
}
$tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
}
$tochan->{nopings} = $nopings; # pump up the timer
- if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
- $ivp->handle_ping;
- }
- } elsif (my $rref = Route::Node::get($r->{to})) {
- if (my $ivp = Investigate::get($from, $fromdxchan->{call})) {
- $ivp->handle_ping;
- }
}
- }
- if ($dxchan->is_user) {
+ _handle_believe($from, $fromdxchan->{call});
+ } elsif ($dxchan->is_user) {
my $s = sprintf "%.2f", $t;
my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
$dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
}
}
+sub _handle_believe
+{
+ my ($from, $via) = @_;
+
+ if (my $ivp = Investigate::get($from, $via)) {
+ $ivp->handle_ping;
+ } else {
+ my $user = DXUser->get_current($from);
+ if ($user) {
+ $user->set_believe($via);
+ $user->put;
+ }
+ }
+}
1;
--- /dev/null
+#
+# Finite size ring buffer creation and access routines
+#
+# Copyright (c) - 1998 Dirk Koopman G1TLH
+#
+# $Id$
+#
+
+use strict;
+
+package RingBuf;
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+
+sub new
+{
+ my $pkg = shift;
+ my $size = shift;
+ return bless [$size, 0, 0, 0, 0, []], (ref $pkg || $pkg);
+}
+
+sub write
+{
+ my $self = shift;
+
+ $self->[5]->[$self->[2]++] = shift;
+ $self->[2] = 0 if $self->[2] >= $self->[0];
+ if ($self->[1] < $self->[0]) {
+ $self->[1] = ++$self->[1];
+ }
+ $self->[2] = $self->[2];
+ if ($self->[1] == $self->[0] && $self->[2] == $self->[3]) {
+ $self->[3] = $self->[2]+1;
+ $self->[3] = 0 if $self->[3] >= $self->[0];
+ }
+}
+
+sub read
+{
+ my $self = shift;
+ return unless $self->[1];
+ my $r;
+
+ if ($self->[4] != $self->[2]) {
+ $r = $self->[5]->[$self->[4]++];
+ $self->[4] = 0 if $self->[4] >= $self->[0];
+ }
+ return $r;
+}
+
+sub rewind
+{
+ my $self = shift;
+ $self->[4] = $self->[3];
+}
+
+sub lth
+{
+ my $self = shift;
+ return $self->[1];
+}
+
+sub readall
+{
+ my $self = shift;
+ my @out;
+
+ $self->rewind;
+ while (my $r = $self->read) {
+ push @out, $r;
+ }
+ return @out;
+}
+1;
close CLLOCK;
}
-if (-e "$userfn") {
+$DXUser::v3 = 1;
+
+if (-e "$userfn.v2" || -e "$userfn.v3") {
print "Do you wish to destroy your user database (THINK!!!) [y/N]: ";
$ans = <STDIN>;
if ($ans =~ /^[Yy]/) {
projects / spider.git / commitdiff