Changeset 529 for trunk

Timestamp:

10/25/12 15:43:55 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL behind block assignment page to IPDB.pm. See #34.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/assign.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -28 +28 @@
         &addMaster
         &listSummary &listMaster &listRBlock &listFree &listPool
-        &getRoutedCity
+        &getTypeList
+        &getParent &getRoutedCity
         &allocateBlock &deleteBlock &getBlockData
         &getNodeList
@@ -41 +42 @@
                 &addMaster
                 &listSummary &listMaster &listRBlock &listFree &listPool
-                &getRoutedCity
+                &getTypeList
+                &getParent &getRoutedCity
                 &allocateBlock &deleteBlock &getBlockData
                 &getNodeList
@@ -467 +469 @@
   return \@poolips;
 } # end listPool()
+
+
+## IPDB::getTypeList()
+# Get an alloctype/description pair list suitable for dropdowns
+# Takes a flag to determine which general groups of types are returned
+# Returns an reference to an array of hashrefs
+sub getTypeList {
+  my $dbh = shift;
+  my $tgroup = shift || 'a';    # technically optional, like this, but should
+                                # 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 => {} });
+  } 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 => {} });
+  } 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 => {} });
+  }
+  return $tlist;
+}
+
+
+## IPDB::getParent()
+# Get a block's parent's details
+# Takes a database handle and CIDR block
+# Returns a hashref to the parent routed or container block, if any
+sub getParent {
+  my $dbh = shift;
+  my $block = shift;
+
+  my $pinfo = $dbh->selectrow_hashref("SELECT cidr,custid,type,city,description FROM allocations".
+        " WHERE cidr >>= ?", undef, ($block) );
+  return $pinfo;
+} # end getParent()
 
 

trunk/cgi-bin/main.cgi

@@ -327 +327 @@
     if ($webvar{fbtype} ne 'y') {
       # Snag the type of the container block from the database.
-      $sth = $ip_dbh->prepare("select type from allocations where cidr >>='$block'");
-      $sth->execute;
-      my @data = $sth->fetchrow_array;
-      $data[0] =~ s/c$/r/;      # Munge the type into the correct form
-      $page->param(fbdisptype => $list_alloctypes{$data[0]});
-      $page->param(type => $data[0]);
+## hmm.  need a flag for parent class/type, sort of?
+      my $pblock = getParent($ip_dbh, $webvar{block});
+      my $ptype = $pblock->{type};
+      $ptype =~ s/c$/r/;
+      $page->param(fbdisptype => $list_alloctypes{$ptype});
+      $page->param(type => $ptype);
     } else {
-      $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder < 500 ".
-        "and type not like '_i' and type not like '_r' order by listorder");
-      $sth->execute;
-      my @typelist;
-      my $selflag = 0;
-      while (my @data = $sth->fetchrow_array) {
-        my %row = (tval => $data[0],
-                type => $data[1],
-                sel => ($selflag == 0 ? ' selected' : '')
-                );
-        push (@typelist, \%row);
-        $selflag++;
-      }
-      $page->param(typelist => \@typelist);
+      # get "primary" alloctypes, since these are all that can correctly be assigned if we're in this branch
+      my $tlist = getTypeList($ip_dbh, 'p');
+      $tlist->[0]->{sel} = 1;
+      $page->param(typelist => $tlist);
     }
   } else {
@@ -364 +354 @@
     $page->param(pops => \@pops);
 
-    # could arguably include routing (500) in the list, but ATM it doesn't
-    # make sense, and in any case that shouldn't be structurally possible here.
-    $sth = $ip_dbh->prepare("select type,listname from alloctypes where listorder <= 500 order by listorder");
-    $sth->execute;
-    my @typelist;
-    my $selflag = 0;
-    while (my @data = $sth->fetchrow_array) {
-      my %row = (tval => $data[0],
-        type => $data[1],
-        sel => ($selflag == 0 ? ' selected' : '')
-        );
-      push (@typelist, \%row);
-      $selflag++;
-    }
-    $page->param(typelist => \@typelist);
+    # get all standard alloctypes
+    my $tlist = getTypeList($ip_dbh, 'a');
+    $tlist->[0]->{sel} = 1;
+    $page->param(typelist => $tlist);
   }
 

trunk/templates/assign.tmpl

@@ -39 +39 @@
 <select name="alloctype">
 <TMPL_LOOP name=typelist>
-        <option value="<TMPL_VAR NAME=tval>"<TMPL_VAR NAME=sel>><TMPL_VAR NAME=type></option></TMPL_LOOP>
+        <option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option></TMPL_LOOP>
 </select>
 <input type="button" value=" ? " onclick="helpAllocTypes()" class="regular">