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

Timestamp:

10/24/12 16:34:36 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for static IP pool list to IPDB.pm. See #34.

• Rename listPool in main.cgi to showPool, so that we can:
• Add listPool sub in IPDB.pm
• Convert getBlockData to return a hashref instead of an array, and update the one extant call

Tweak template to use odd for row colors

File:

• trunk/cgi-bin/IPDB.pm (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -27 +27 @@
         &initIPDBGlobals &connectDB &finish &checkDBSanity
         &addMaster
-        &listSummary &listMaster &listRBlock &listFree
+        &listSummary &listMaster &listRBlock &listFree &listPool
         &getRoutedCity
         &allocateBlock &deleteBlock &getBlockData
@@ -40 +40 @@
                 &initIPDBGlobals &connectDB &finish &checkDBSanity
                 &addMaster
-                &listSummary &listMaster &listRBlock &listFree
+                &listSummary &listMaster &listRBlock &listFree &listPool
                 &getRoutedCity
                 &allocateBlock &deleteBlock &getBlockData
@@ -443 +443 @@
   return \@flist;
 } # end listFree()
+
+
+## IPDB::listPool()
+#
+sub listPool {
+  my $dbh = shift;
+  my $pool = shift;
+
+  my $sth = $dbh->prepare("SELECT ip,custid,available,description,type".
+        " FROM poolips WHERE pool = ? ORDER BY ip");
+  $sth->execute($pool);
+  my @poolips;
+  while (my ($ip,$custid,$available,$desc,$type) = $sth->fetchrow_array) {
+    my %row = (
+        ip => $ip,
+        custid => $custid,
+        available => $available,
+        desc => $desc,
+        delme => $available eq 'n'
+        );
+    push @poolips, \%row;
+  }
+  return \@poolips;
+} # end listPool()
 
 
@@ -972 +996 @@
   my $block = shift;
 
-  my $sth = $dbh->prepare("select cidr,custid,type,city,description from searchme".
-        " where cidr='$block'");
-  $sth->execute();
-  return $sth->fetchrow_array();
+  my $binfo = $dbh->selectrow_hashref("SELECT cidr,custid,type,city,description FROM searchme".
+        " WHERE cidr = ?", undef, ($block) );
+  return $binfo;
 } # end getBlockData()