Changeset 530 for trunk

Timestamp:

10/25/12 17:59:15 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up and move most SQL for node handling into IPDB.pm. See #34.
Tweak "new assignment" and "edit block" templates a little to match
and for consistency.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (7 diffs)
• templates/assign.tmpl (modified) (1 diff)
• templates/edit.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -31 +31 @@
         &getParent &getRoutedCity
         &allocateBlock &deleteBlock &getBlockData
-        &getNodeList
+        &getNodeList &getNodeName &getNodeInfo
         &mailNotify
         );
@@ -45 +45 @@
                 &getParent &getRoutedCity
                 &allocateBlock &deleteBlock &getBlockData
-                &getNodeList
+                &getNodeList &getNodeName &getNodeInfo
                 &mailNotify
                 )]
@@ -1057 +1057 @@
 
 
+## IPDB::getNodeName()
+# Get node name from the ID
+sub getNodeName {
+  my $dbh = shift;
+  my $nid = shift;
+
+  my ($nname) = $dbh->selectrow_array("SELECT node_name FROM nodes WHERE node_id = ?", undef, ($nid) );
+  return $nname;
+} # end getNodeName()
+
+
+## IPDB::getNodeInfo()
+# Get node name and ID associated with a block
+sub getNodeInfo {
+  my $dbh = shift;
+  my $block = shift;
+
+  my ($nid, $nname) = $dbh->selectrow_array("SELECT nodes.node_id,node_name FROM nodes INNER JOIN noderef".
+        " ON nodes.node_id=noderef.node_id WHERE noderef.block = ?", undef, ($block) );
+  return ($nid, $nname);
+} # end getNodeInfo()
+
+
 ## IPDB::mailNotify()
 # Sends notification mail to recipients regarding an IPDB operation

trunk/cgi-bin/main.cgi

@@ -368 +368 @@
 
 ## node hack
-  $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
-  $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
-  my @nodes;
-  while (my ($nid,$nname) = $sth->fetchrow_array()) {
-    my %row = (nid => $nid, nname => $nname);
-    push (@nodes, \%row);
-  }
-  $page->param(nodelist => \@nodes);
+  my $nlist = getNodeList($ip_dbh);
+  $page->param(nodelist => $nlist);
 ## end node hack
 
@@ -428 +422 @@
   } else { # end show pool options
 
+##fixme: uninitialized
     if ($webvar{fbassign} eq 'y') {
       $cidr = new NetAddr::IP $webvar{block};
@@ -442 +437 @@
       my $extracond = '';
       if ($webvar{allocfrom} eq '-') {
+##fixme: uninitialized
         $extracond = ($webvar{allowpriv} eq 'on' ? '' : 
                 " and not (cidr <<= '192.168.0.0/16'".
@@ -519 +515 @@
 ## node hack
   if ($webvar{node} && $webvar{node} ne '-') {
-    $sth = $ip_dbh->prepare("SELECT node_name FROM nodes WHERE node_id=?");
-    $sth->execute($webvar{node});
-    my ($nodename) = $sth->fetchrow_array();
+    my $nodename = getNodeName($ip_dbh, $webvar{node});
     $page->param(nodename => $nodename);
     $page->param(nodeid => $webvar{node});
@@ -756 +750 @@
 
 ## node hack
-  $sth = $ip_dbh->prepare("SELECT nodes.node_id,node_name FROM nodes INNER JOIN noderef".
-        " ON nodes.node_id=noderef.node_id WHERE noderef.block='$webvar{block}'");
-  $sth->execute;
-  my ($nodeid,$nodename) = $sth->fetchrow_array();
+  my ($nodeid,$nodename) = getNodeInfo($ip_dbh, $webvar{block});
   $page->param(havenodeid => $nodeid);
 
@@ -771 +762 @@
 #  (currently) have a nodeid set in the first place.
     if ($IPDBacl{$authuser} =~ /c/) {
-      $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
-      $sth->execute;
-      my @nodelist;
-      while (my ($nid,$nname) = $sth->fetchrow_array()) {
-        my %row = (
-                selme => ($nodeid == $nid),
-                nodeid => $nid,
-                nodename => $nname,
-                );
-        push (@nodelist, \%row);
+      my $nlist = getNodeList($ip_dbh);
+      foreach (@{$nlist}) {
+        $$_{selme} = ($$_{node_id} == $nodeid);
       }
-      $page->param(nodelist => \@nodelist);
+      $page->param(nodelist => $nlist);
     }
   }
@@ -870 +854 @@
 ## node hack
   if ($webvar{node} && $webvar{node} ne '-') {
-    $sth = $ip_dbh->prepare("SELECT node_name FROM nodes WHERE node_id=?");
-    $sth->execute($webvar{node});
-    my ($nodename) = $sth->fetchrow_array();
+    my $nodename = getNodeName($ip_dbh, $webvar{node});
     $page->param(nodename => $nodename);
   }

trunk/templates/assign.tmpl

@@ -62 +62 @@
 <td>
 <select name="node">
-        <option selected="selected">-</option>
+        <option selected>-</option>
 <TMPL_LOOP NAME=nodelist>
-        <option value="<TMPL_VAR NAME=nid>"><TMPL_VAR NAME=nname></option></TMPL_LOOP>
+        <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
 </select>
 &nbsp;<a href="javascript:popNotes('<TMPL_VAR NAME=webpath>/cgi-bin/newnode.cgi')">Add new location</a>

trunk/templates/edit.tmpl

@@ -55 +55 @@
         <option selected="selected">--</option></TMPL_UNLESS>
 <TMPL_LOOP NAME=nodelist>
-        <option <TMPL_IF selme>selected="selected"</TMPL_IF> value="<TMPL_VAR NAME=nodeid>"><TMPL_VAR NAME=nodename></option></TMPL_LOOP>
+        <option value="<TMPL_VAR NAME=node_id>"<TMPL_IF selme> selected</TMPL_IF>><TMPL_VAR NAME=node_name></option></TMPL_LOOP>
 </select>
 <TMPL_ELSE>