Index: trunk/cgi-bin/main.cgi
===================================================================
--- trunk/cgi-bin/main.cgi	(revision 517)
+++ trunk/cgi-bin/main.cgi	(revision 519)
@@ -155,12 +155,6 @@
 }
 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,5 +195,5 @@
 }
 
-
+$sth->finish if $sth;
 # Clean up IPDB globals, DB handle, etc.
 finish($ip_dbh);