Changeset 632

Timestamp:

10/08/14 17:47:56 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 6/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Update IPDB::getMasterList()
• Update IPDB::getTypeList()

File:

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

trunk/cgi-bin/IPDB.pm

@@ -653 +653 @@
   my $stampme = shift || 'm';   # optional but should be set by caller for clarity
 
-  my $mlist = $dbh->selectall_arrayref("SELECT cidr AS master".($stampme eq 'm' ? ',mtime' : '').
-        " FROM masterblocks ORDER BY cidr", { Slice => {} });
+  my $mlist = $dbh->selectall_arrayref("SELECT id,vrf,cidr AS master".($stampme eq 'm' ? ',modifystamp AS mtime' : '').
+        " FROM allocations WHERE type='mm' ORDER BY cidr", { Slice => {} });
   return $mlist;
 } # end getMasterList()
@@ -682 +682 @@
     $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
         " AND (type LIKE '_i' OR type LIKE '_r') ORDER BY listorder", { Slice => {} });
+  } elsif ($tgroup eq 'i') {
+    # grouping 'i' - static IP types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        " AND type LIKE '_i' ORDER BY listorder", { Slice => {} });
   } else {
     # grouping 'a' - all standard allocation types.  This includes everything