Changeset 541 for trunk/cgi-bin/admin.cgi

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.

File:

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

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);
 
 }