Changeset 595 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

05/15/13 17:26:55 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Hand-backport pieces of the allocate-from-routed-freeblock from /trunk
post-r553. Cherrypick merge not possible due to intermingled changes
relating to the database structure updates.
Includes a handful of harmless references to the new structure.
Will likely cause merge conflicts when the structure update is merged.

File:

• branches/stable/cgi-bin/IPDB.pm (modified) (1 diff)

branches/stable/cgi-bin/IPDB.pm

@@ -504 +504 @@
                                 # really be specified in the call for clarity
   my $tlist;
-  if ($tgroup eq 'p') {
-    # grouping 'p' - primary allocation types.  These include static IP pools (_d and _p),
-    # dynamic-allocation ranges (_e), containers (_c), and the "miscellaneous" cn, in, and en types.
-    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder < 500 ".
-        "AND type NOT LIKE '_i' AND type NOT LIKE '_r' ORDER BY listorder", { Slice => {} });
+  if ($tgroup eq 'n') {
+    # grouping 'n' - all netblock types.  These include routed blocks, containers (_c)
+    # and contained (_r) types, dynamic-allocation ranges (_e), static IP pools (_d and _p),
+    # and the "miscellaneous" cn, in, and en types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        "AND type NOT LIKE '_i' ORDER BY listorder", { Slice => {} });
+  } elsif ($tgroup eq 'p') {
+    # grouping 'p' - primary allocation types.  As with 'n' above but without the _r contained types.
+    $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
+        "AND type NOT LIKE '_i' AND type NOT LIKE '_r' ORDER BY listorder", { Slice => {} });
   } elsif ($tgroup eq 'c') {
     # grouping 'c' - contained types.  These include all static IPs and all _r types.
     $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
-        " AND (type LIKE '_i' OR type LIKE '_r') ORDER BY listorder", { Slice => {} });
+        " 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
     # but mm (present only as a formality).  Make this the default.
     $tlist = $dbh->selectall_arrayref("SELECT type,listname FROM alloctypes WHERE listorder <= 500 ".
-        " ORDER BY listorder", { Slice => {} });
+        " ORDER BY listorder", { Slice => {} });
   }
   return $tlist;