Changeset 541 for trunk/cgi-bin/IPDB.pm

Timestamp:

11/02/12 15:54:31 (11 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/IPDB.pm (modified) (5 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()