Changeset 70 for trunk

Timestamp:

07/19/18 17:57:31 (6 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Further tweaks from production

File:

• trunk/dnsbl/DNSBL.pm (modified) (2 diffs)

trunk/dnsbl/DNSBL.pm

@@ -205 +205 @@
   my $self = shift;
   my $rep = shift;
-  my $exclude = shift;
+  my $exclude = shift || 'n';
   my $sth;
   my $rows = 0;
@@ -227 +227 @@
       $sth = $dbh->prepare("SELECT block FROM blocks WHERE block >> ?");
       $sth->execute($rep);
-      my $updsth = $dbh->prepare("UPDATE blocks SET ipcount=(SELECT count(*) FROM iplist WHERE ip << ? AND exclude='n') WHERE block=?");
+      my $updsth = $dbh->prepare("UPDATE blocks SET ipcount=(".
+        "SELECT count(*) FROM iplist i JOIN blocks b ON b.block=i.parent WHERE i.ip << ? AND i.exclude='n' AND b.exclude='n'".
+        ") WHERE block=?");
       while (my ($block) = $sth->fetchrow_array) {
         $updsth->execute($block,$block);