Changeset 712 for trunk

Timestamp:

03/25/15 17:11:27 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Exclude $self from the count of allocations in a container in listSubs()
and listContainers()

File:

• trunk/cgi-bin/IPDB.pm (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -524 +524 @@
         "AND type ~ '[mc]\$' AND master_id = ? AND NOT cidr = ? ");
   my $alsth = $dbh->prepare("SELECT count(*) FROM allocations WHERE cidr <<= ? ".
-        "AND NOT type='rm' AND NOT type='mm' AND master_id = ?");
+        "AND NOT type='rm' AND NOT type='mm' AND master_id = ? AND NOT id = ?");
   my $freesth = $dbh->prepare("SELECT count(*) FROM freeblocks WHERE cidr <<= ? AND master_id = ?");
   my $lfreesth = $dbh->prepare("SELECT masklen(cidr) AS maskbits FROM freeblocks WHERE cidr <<= ?".
@@ -537 +537 @@
     $substh->execute($cidr, $mid, $cidr);
     my ($cont) = $substh->fetchrow_array();
-    $alsth->execute($cidr, $mid);
+    $alsth->execute($cidr, $mid, $id);
     my ($alloc) = $alsth->fetchrow_array();
     $freesth->execute($cidr, $mid);
@@ -588 +588 @@
 
   my $alsth = $dbh->prepare("SELECT count(*) FROM allocations WHERE cidr <<= ? ".
-        "AND NOT type='rm' AND NOT type='mm' AND master_id = ?");
+        "AND NOT type='rm' AND NOT type='mm' AND master_id = ? AND NOT id = ?");
   my $freesth = $dbh->prepare("SELECT count(*) FROM freeblocks WHERE cidr <<= ? AND master_id = ?");
   my $lfreesth = $dbh->prepare("SELECT masklen(cidr) AS maskbits FROM freeblocks WHERE cidr <<= ?".
@@ -597 +597 @@
     $desc .= " - vrf:$vrf" if $desc && $vrf;
     $desc = "vrf:$vrf" if !$desc && $vrf;
-    $alsth->execute($cidr, $mid);
+    $alsth->execute($cidr, $mid, $id);
     my ($alloc) = $alsth->fetchrow_array();
     $freesth->execute($cidr, $mid);