Changeset 541 for trunk

Timestamp:

11/02/12 15:54:31 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Start on SQL in admin.cgi. See #34.

• Convert Q-n-D allocation list on main page to use existing getTypeList()
• Convert timestamp-update master block list to use new getMasterList(), with a flag set to return the last-modified time. Also convert main.cgi new assignment page to use this, with the flag set to not return the lastmod.
• Tweak admin main template to match

While following the code for the master block list, I also removed
several useless globals (@masterblocks, %allocated, %free, and
%routed) since they were only used originally in one place (index
page from main.cgi), obsoleted by changes in r523, and in fact got
overridden locally before that anyway.

Location:

trunk

Files:

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

trunk/cgi-bin/IPDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK    = qw(
-        %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
-        %allocated %free %routed %bigfree %IPDBacl %aclmsg
+        %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
+        %IPDBacl %aclmsg
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster
         &listSummary &listMaster &listRBlock &listFree &listPool
-        &getTypeList &getPoolSelect &findAllocateFrom
+        &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
         &ipParent &subParent &blockParent &getRoutedCity
         &allocateBlock &updateBlock &deleteBlock &getBlockData
@@ -38 +38 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                @masterblocks %allocated %free %routed %bigfree %IPDBacl %aclmsg
+                %IPDBacl %aclmsg
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster
                 &listSummary &listMaster &listRBlock &listFree &listPool
-                &getTypeList &getPoolSelect &findAllocateFrom
+                &getMasterList &getTypeList &getPoolSelect &findAllocateFrom
                 &ipParent &subParent &blockParent &getRoutedCity
                 &allocateBlock &updateBlock &deleteBlock &getBlockData
@@ -58 +58 @@
 our @citylist;
 our @poplist;
-our @masterblocks;
-our %allocated;
-our %free;
-our %routed;
-our %bigfree;
 our %IPDBacl;
 
@@ -121 +116 @@
   }
 
-  # Master block list
-  $sth = $dbh->prepare("select cidr from masterblocks order by cidr");
-  $sth->execute;
-  return (undef,$sth->errstr) if $sth->err;
-  for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
-    $masterblocks[$i] = new NetAddr::IP $data[0];
-    $allocated{"$masterblocks[$i]"} = 0;
-    $free{"$masterblocks[$i]"} = 0;
-    $bigfree{"$masterblocks[$i]"} = 128; # Larger number means smaller block.
-                                        # Set to 128 to prepare for IPv6
-    $routed{"$masterblocks[$i]"} = 0;
-  }
-
   # Load ACL data.  Specific username checks are done at a different level.
   $sth = $dbh->prepare("select username,acl from users");
@@ -469 +451 @@
   return \@poolips;
 } # end listPool()
+
+
+## IPDB::getMasterList()
+# Get a list of master blocks, optionally including last-modified timestamps
+# Takes an optional flag to indicate whether to include timestamps;
+#  'm' includes ctime, all others (suggest 'c') do not.
+# Returns an arrayref to a list of hashrefs
+sub getMasterList {
+  my $dbh = shift;
+  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 => {} });
+  return $mlist;
+} # end getMasterList()
 
 

trunk/cgi-bin/admin.cgi

@@ -106 +106 @@
   $sth->execute;
 
-  my @typelist;
-  my $count = 0;
-  while (my ($type,$listname) = $sth->fetchrow_array) {
-    my %row = (
-        selected => $count++,
-        type => $type,
-        dispname => $listname
-        );
-    push @typelist, \%row;
-  }
-  $page->param(typelist => \@typelist);
-
-  my @masterlist;
-  $sth = $ip_dbh->prepare("select cidr,mtime from masterblocks order by cidr");
-  $sth->execute;
-  while (my ($cidr,$mtime) = $sth->fetchrow_array) {
-    my %row = (
-        master => $cidr,
-        masterdate => $mtime
-        );
-    push @masterlist, \%row;
-  }
-  $page->param(masterlist => \@masterlist);
+  my $tlist = getTypeList($ip_dbh, 'a');
+  $tlist->[0]->{sel} = 1;
+  $page->param(typelist => $tlist);
+
+  my $mlist = getMasterList($ip_dbh, 'm');
+  $page->param(masterlist => $mlist);
 
 }

trunk/cgi-bin/main.cgi

@@ -338 +338 @@
     }
   } else {
-    my @masterlist;
-    foreach my $master (@masterblocks) {
-      my %row = (master => "$master");
-      push (@masterlist, \%row);
-    }
-    $page->param(masterlist => \@masterlist);
+    my $mlist = getMasterList($ip_dbh, 'c');
+    $page->param(masterlist => $mlist);
 
     my @pops;

trunk/templates/admin/main.tmpl

@@ -8 +8 @@
 Allocate block/IP: <input name="cidr"> as
 <select name="alloctype">
-<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_UNLESS selected> selected</TMPL_UNLESS>><TMPL_VAR NAME=dispname></option>
+<TMPL_LOOP NAME=typelist><option value="<TMPL_VAR NAME=type>"<TMPL_IF sel> selected</TMPL_IF>><TMPL_VAR NAME=listname></option>
 </TMPL_LOOP>
 </select>
@@ -29 +29 @@
 Bump "last updated" timestamp on this master:
 <select name="whichmaster">
-<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=masterdate>)</option>
+<TMPL_LOOP NAME=masterlist><option value="<TMPL_VAR NAME=master>"><TMPL_VAR NAME=master> (<TMPL_VAR NAME=mtime>)</option>
 </TMPL_LOOP>
 </select>