Changeset 460

Timestamp:

08/04/10 16:49:53 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert "new node" miniscript and page to template. See #3.
Update call from assign.tmpl to point to newcity.cgi.
Clean up errors and warnings from newnode.cgi in HTTPD error
log. See #31. (Also note newcity.cgi changes in r459 have
the same cleanups.)

Location:

branches/htmlform

Files:

• cgi-bin/newnode.cgi (modified) (2 diffs)
• templates/assign.tmpl (modified) (1 diff)
• templates/newnode.tmpl (added)

branches/htmlform/cgi-bin/newnode.cgi

@@ -14 +14 @@
 #use CGI::Carp qw(fatalsToBrowser);
 use CGI::Simple;
+use HTML::Template;
 use DBI;
-use CommonWeb qw(:ALL);
+#use CommonWeb qw(:ALL);
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -47 +48 @@
 my $sth;
 
+$ENV{HTML_TEMPLATE_ROOT} = '../templates';
+
+my $page = HTML::Template->new(filename => "newnode.tmpl");
+
+if ($webvar{nodename}) {
+  $sth = $dbh->prepare("insert into nodes (node_type,node_name,node_ip) values (?,?,?)");
+  $sth->execute($webvar{type}, $webvar{nodename}, $webvar{nodeip});
+  $page->param(nodename => $webvar{nodename});
+  if ($sth->err) {
+    $page->param(err => $sth->errstr);
+    my $msg = "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr;
+    mailNotify($dbh, 'f:nno', "IPDB node add failure", $msg);
+    syslog "err", $msg;
+  } else {
+    syslog "notice", "$authuser added node '$webvar{nodename}'";
+  }
+}
+
 print "Content-type: text/html\n\n";
 
-$sth = $dbh->prepare("insert into nodes (node_type,node_name,node_ip)".
-        " values ('$webvar{type}','$webvar{nodename}','$webvar{nodeip}')");
-$sth->execute;
-
-if ($sth->err) {
-  print "Error adding node to database: ".$sth->errstr;
-  mailNotify($dbh, 'f:nno', "IPDB node add failure",
-        "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr);
-  syslog "err", "$authuser could not add node '$webvar{nodename}','$webvar{type}' to database: ".$sth->errstr;
-} else {
-  print "Node added.  Closing this window should refresh the page.";
-  syslog "notice", "$authuser added node '$webvar{nodename}'";
-}
+print $page->output;
 
 finish($dbh);

branches/htmlform/templates/assign.tmpl

@@ -66 +66 @@
         <option value="<TMPL_VAR NAME=nid>"><TMPL_VAR NAME=nname></option></TMPL_LOOP>
 </select>
-&nbsp;<a href="javascript:popNotes('/ip/newnode.html')">Add new location</a>
+&nbsp;<a href="javascript:popNotes('/ip/cgi-bin/newnode.cgi')">Add new location</a>
 </td>
 </tr>