Changeset 714 for trunk

Timestamp:

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

Author:

Kris Deugau

Message:

/trunk

Revise getTypeList() to accept another parameter to flag the the
"selected" type.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -750 +750 @@
   my $tgroup = shift || 'a';    # technically optional, like this, but should
                                 # really be specified in the call for clarity
-  my $tlist;
+  my $seltype = shift || '';
+
+  my $sql = "SELECT type,listname,type=? AS sel FROM alloctypes WHERE listorder <= 500";
   if ($tgroup eq 'n') {
     # grouping 'p' - 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 => {} });
+    $sql .= " AND type NOT LIKE '_i'";
   } 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 => {} });
+    $sql .= " AND type NOT LIKE '_i' AND type NOT LIKE '_r'";
   } 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 => {} });
+    $sql .= " AND (type LIKE '_i' OR type LIKE '_r')";
   } 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 => {} });
+    $sql .= " AND type LIKE '_i'";
   } 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 => {} });
-  }
+    # ... whee!  no extra WHERE clauses
+  }
+  $sql .= " ORDER BY listorder";
+  my $tlist = $dbh->selectall_arrayref($sql, { Slice => {} }, $seltype);
   return $tlist;
 }