Changeset 479

Timestamp:

09/17/10 18:49:45 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Convert initial DB connection error output to a sane page. Could arguably provide
space for this (and other) errors on all normal pages. (See #3).
This allows us to:

• Remove editError sub in main.cgi
• Remove printHeader sub in CommonWeb.pm (see #15, #26)

Removed duplicate "exit if we get this far"
Tweak IPDB::finish so it doesn't spit a fatal error when called with a null database handle

Location:

branches/htmlform/cgi-bin

Files:

• CommonWeb.pm (modified) (2 diffs)
• IPDB.pm (modified) (1 diff)
• main.cgi (modified) (6 diffs)

branches/htmlform/cgi-bin/CommonWeb.pm

@@ -16 +16 @@
 $VERSION     = 1.00;
 @ISA         = qw(Exporter);
-@EXPORT_OK      = qw( &printHeader &printError &printAndExit &desanitize &cleanInput &desanitize);
+@EXPORT_OK      = qw( &printError &printAndExit &desanitize &cleanInput &desanitize);
 
 @EXPORT      = (); #export nothing by default
@@ -25 +25 @@
                 );
 
-
-sub printHeader {
-  my $title = shift;
-  print "Content-type: text/html\n\n";
-# This doesn't work well.  Must investigate.
-#  my $realm = shift;
-#  print qq(WWW-Authenticate: Basic realm="$realm"\n) if $realm;
-  open FILE, "../header.inc"
-        or carp $!;
-  my $html = join('',<FILE>);
-  close FILE;
-
-  $html =~ s/\$\$TITLE\$\$/$title/;
-# Necessary for mangling arbitrary bits of the header
-  my $i=0;
-  while (defined(my $param = shift)) {
-    $html =~ s/\$\$EXTRA$i\$\$/$param/g;
-    $i++;
-  }
-  print $html;
-}
 
 sub printError($)

branches/htmlform/cgi-bin/IPDB.pm

@@ -174 +174 @@
 sub finish {
   my $dbh = $_[0];
-  $dbh->disconnect;
+  $dbh->disconnect if $dbh;
 } # end finish
 

branches/htmlform/cgi-bin/main.cgi

@@ -46 +46 @@
 syslog "debug", "$authuser active, $ENV{'REMOTE_ADDR'}";
 
+##fixme there *must* be a better order to do things in so this can go back where it was
+# CGI fiddling done here so we can declare %webvar so we can alter $webvar{action}
+# to show the right page on DB errors.
+# Set up the CGI object...
+my $q = new CGI::Simple;
+# ... and get query-string params as well as POST params if necessary
+$q->parse_query_string;
+
+# Convenience;  saves changing all references to %webvar
+##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
+my %webvar = $q->Vars;
+
 # Why not a global DB handle?  (And a global statement handle, as well...)
 # Use the connectDB function, otherwise we end up confusing ourselves
@@ -53 +65 @@
 ($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
-  exitError("Database error: $errstr\n");
-}
-initIPDBGlobals($ip_dbh);
+  $webvar{action} = "dberr";
+} else {
+  initIPDBGlobals($ip_dbh);
+}
 
 # Set up some globals
@@ -66 +79 @@
 $header->param(addperm => $IPDBacl{$authuser} =~ /a/);
 print "Content-type: text/html\n\n", $header->output;
-
-# Set up the CGI object...
-my $q = new CGI::Simple;
-# ... and get query-string params as well as POST params if necessary
-$q->parse_query_string;
-
-# Convenience;  saves changing all references to %webvar
-##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
-my %webvar = $q->Vars;
 
 
@@ -153 +157 @@
   }
   $page->param(nodelist => \@nodelist);
+}
+
+# DB failure.  Can't do much here, really.
+elsif ($webvar{action} eq 'dberr') {
+  $page->param(errmsg => $errstr);
 }
 
@@ -192 +201 @@
 # Just in case something waaaayyy down isn't in place
 # properly... we exit explicitly.
-exit;
-
+exit 0;
 
 
@@ -1257 +1265 @@
 
 } # finalDelete
-
-
-# going, going, gone... this sub to be removed Any Day Real Soon Now(TM)
-sub exitError {
-  my $errStr = $_[0];
-  printHeader('','');
-  print qq(<center><p class="regular"> $errStr </p>
-<input type="button" value="Back" onclick="history.go(-1)">
-</center>
-);
-
-  # We print the footer here, so we don't have to do it elsewhere.
-  # include the admin tools link in the output?
-  $footer->param(adminlink => ($IPDBacl{$authuser} =~ /A/));
-
-  print $footer->output;
-
-  exit;
-} # errorExit
-
-
-# Just in case we manage to get here.
-exit 0;