Changeset 517 for trunk/cgi-bin/allocate.pl

Timestamp:

10/18/12 16:53:10 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Finally merge conversion to HTML::Template from /branches/htmlform

• Node "hack" showed conflict due to having been added to all branches in parallel
• editDisplay.html was apparently changed enough that the merged delete caused an irrelevant conflict

Closes #3.

Location:

trunk

Files:

• . (modified) (1 prop)
• cgi-bin/allocate.pl (modified) (2 diffs)

trunk/cgi-bin/allocate.pl

@@ -11 +11 @@
 use warnings;
 use DBI;
-use CommonWeb qw(:ALL);
 use NetAddr::IP;
 
@@ -38 +37 @@
 my $errstr;
 ($ip_dbh,$errstr) = connectDB_My;
-if (!$ip_dbh) {
-  printAndExit("Failed to connect to database: $errstr\n");
-}
+die "Failed to connect to database: $errstr\n"
+        if !$ip_dbh;
+
 checkDBSanity($ip_dbh);
 initIPDBGlobals($ip_dbh);