New server, FileBin instead of $ENV{BFConfDir}, and custom Captcha

[buildfarm-server.git] / cgi-bin / show_stage_log.pl

diff --git a/cgi-bin/show_stage_log.pl b/cgi-bin/show_stage_log.pl
index 539d5a1cfe17f6dbc430492a9743456afbde2f82..38ccf89a3470e8168969c72b1efcf046487ef6a7 100755 (executable)
--- a/cgi-bin/show_stage_log.pl
+++ b/cgi-bin/show_stage_log.pl
@@ -1,5 +1,13 @@
 #!/usr/bin/perl
 
+=comment
+
+Copyright (c) 2003-2010, Andrew Dunstan
+
+See accompanying License file for license details
+
+=cut 
+
 use strict;
 use DBI;
 use Template;
@@ -8,9 +16,8 @@ use File::Temp qw(tempfile);
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport @log_file_names);
 
-
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
-#require "BuildFarmWeb.pl";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";
 
 die "no dbname" unless $dbname;
 die "no dbuser" unless $dbuser;
@@ -24,6 +31,7 @@ my $query = new CGI;
 my $system = $query->param('nm'); $system =~ s/[^a-zA-Z0-9_ -]//g;
 my $logdate = $query->param('dt');$logdate =~ s/[^a-zA-Z0-9_ -]//g;
 my $stage = $query->param('stg');$stage =~ s/[^a-zA-Z0-9._ -]//g;
+my $brnch = $query->param('branch') || 'HEAD'; $brnch =~ s/[^a-zA-Z0-9._ -]//g;
 
 use vars qw($tgz);
 
@@ -33,6 +41,20 @@ if ($system && $logdate && $stage)
 
     die $DBI::errstr unless $db;
 
+    if ($logdate =~ /^latest$/i)
+    {
+       my $find_latest = qq{
+            select max(snapshot) 
+            from build_status_log 
+            where sysname = ? 
+                and snapshot > now() - interval '30 days' 
+                and log_stage = ? || '.log'
+                and branch = ?
+        };
+       my $logs = $db->selectcol_arrayref($find_latest,undef,$system,$stage,$brnch);
+       $logdate = shift(@$logs);
+    }
+
     my $statement = q(
 
         select branch, log_text
@@ -40,8 +62,6 @@ if ($system && $logdate && $stage)
         where sysname = ? and snapshot = ? and log_stage = ? || '.log'
 
         );
-
-
     
     my $sth=$db->prepare($statement);
     $sth->execute($system,$logdate,$stage);
@@ -55,11 +75,11 @@ if ($system && $logdate && $stage)
     $sth->finish;
     $db->disconnect;
 
-    print "Content-Type: text/plain\n\n", $logtext,
+    print "Content-Type: text/plain\n\nSnapshot: $logdate\n\n", $logtext,
 
     "-------------------------------------------------\n\n",
-    "Hosting for the PostgreSQL Buildfarm is generously ",
-    "provided by: CommandPrompt, The PostgreSQL Company";
+    "Hosting for the Exim BuildFarm is generously ",
+    "provided by: Host1";
 
 }
 
@@ -68,4 +88,3 @@ else
     print "Status: 460 bad parameters\n",
     "Content-Type: text/plain\n\n";
 }
-