Changeset 519 for trunk

Timestamp:

10/19/12 16:15:59 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Move SQL for node search page into IPDB.pm. See #34.
Also tweak some handling for the lingering global statement handle
variable, since it may be undefined instead of a statement handle.

Location:

trunk

Files:

• cgi-bin/IPDB.pm (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (2 diffs)
• templates/nodesearch.tmpl (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -26 +26 @@
         %allocated %free %routed %bigfree %IPDBacl %aclmsg
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &addMaster
-        &deleteBlock &getBlockData &mailNotify
+        &deleteBlock &getBlockData
+        &getNodeList
+        &mailNotify
         );
 
@@ -34 +36 @@
                 @masterblocks %allocated %free %routed %bigfree %IPDBacl %aclmsg
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
-                &addMaster &deleteBlock &getBlockData &mailNotify
+                &addMaster &deleteBlock &getBlockData
+                &getNodeList
+                &mailNotify
                 )]
         );
@@ -832 +836 @@
 
 
+## IPDB::getNodeList()
+# Gets a list of node ID+name pairs as an arrayref to a list of hashrefs
+sub getNodeList {
+  my $dbh = shift;
+  
+  my $ret = $dbh->selectall_arrayref("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id",
+        { Slice => {} });
+  return $ret;
+} # end getNodeList()
+
+
 ## IPDB::mailNotify()
 # Sends notification mail to recipients regarding an IPDB operation

trunk/cgi-bin/main.cgi

@@ -155 +155 @@
 }
 elsif ($webvar{action} eq 'nodesearch') {
-  $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
-  $sth->execute() or $page->param(errmsg => $sth->errstr);
-  my @nodelist;
-  while (my ($nid,$nname) = $sth->fetchrow_array()) {
-    my %row = (nodeid => $nid, nodename => $nname);
-    push @nodelist, \%row;
-  }
-  $page->param(nodelist => \@nodelist);
+  my $nodelist = getNodeList($ip_dbh);
+  $page->param(nodelist => $nodelist);
 }
 
@@ -201 +195 @@
 }
 
-
+$sth->finish if $sth;
 # Clean up IPDB globals, DB handle, etc.
 finish($ip_dbh);

trunk/templates/nodesearch.tmpl

@@ -11 +11 @@
 <td><select name="node">
         <option>--</option>
-<TMPL_LOOP NAME=nodelist>       <option value="<TMPL_VAR NAME=nodeid>"><TMPL_VAR NAME=nodename></option>
+<TMPL_LOOP NAME=nodelist>       <option value="<TMPL_VAR NAME=node_id>"><TMPL_VAR NAME=node_name></option>
 </TMPL_LOOP>
 </select></td>