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

Timestamp:

10/31/12 17:56:03 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move SQL for post-update backlink to IPDB.pm. See #34.
Also rename getParent() to subParent() to fit in with ipParent() and
blockParent().

Fix a couple "Use of uninitialized..." log-noise bugs. See #31.

Move some HTML-entity-escaping into the template, and shuffle lines
munging the notes and restricted data on post-update value display
so we can properly munge in <br> for \n. Doesn't seem to be a way
to plug that into HTML::Template. :( See #3.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -29 +29 @@
         &listSummary &listMaster &listRBlock &listFree &listPool
         &getTypeList &getPoolSelect &findAllocateFrom
-        &getParent &getRoutedCity
+        &ipParent &subParent &blockParent &getRoutedCity
         &allocateBlock &updateBlock &deleteBlock &getBlockData
         &getNodeList &getNodeName &getNodeInfo
@@ -43 +43 @@
                 &listSummary &listMaster &listRBlock &listFree &listPool
                 &getTypeList &getPoolSelect &findAllocateFrom
-                &getParent &getRoutedCity
+                &ipParent &subParent &blockParent &getRoutedCity
                 &allocateBlock &updateBlock &deleteBlock &getBlockData
                 &getNodeList &getNodeName &getNodeInfo
@@ -576 +576 @@
 
 
-## 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 {
+## IPDB::ipParent()
+# Get an IP's parent pool's details
+# Takes a database handle and IP
+# Returns a hashref to the parent pool block, if any
+sub ipParent {
   my $dbh = shift;
   my $block = shift;
@@ -587 +587 @@
         " WHERE cidr >>= ?", undef, ($block) );
   return $pinfo;
-} # end getParent()
+} # end ipParent()
+
+
+## IPDB::subParent()
+# Get a block's parent's details
+# Takes a database handle and CIDR block
+# Returns a hashref to the parent container block, if any
+sub subParent {
+  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 subParent()
+
+
+## IPDB::blockParent()
+# Get a block's parent's details
+# Takes a database handle and CIDR block
+# Returns a hashref to the parent container block, if any
+sub blockParent {
+  my $dbh = shift;
+  my $block = shift;
+
+  my $pinfo = $dbh->selectrow_hashref("SELECT cidr,city FROM routed".
+        " WHERE cidr >>= ?", undef, ($block) );
+  return $pinfo;
+} # end blockParent()