From 7b1925783091a425953e7abc9ce2c23e6f333e7f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 27 Nov 2008 17:01:41 +0000
Subject: [PATCH]

---
 src/Hydra/lib/Hydra/Controller/Root.pm | 32 +++++++++++++++++++++++---
 src/Hydra/root/releases.tt             |  6 ++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/Hydra/lib/Hydra/Controller/Root.pm b/src/Hydra/lib/Hydra/Controller/Root.pm
index b4683b8f..da39d7e2 100644
--- a/src/Hydra/lib/Hydra/Controller/Root.pm
+++ b/src/Hydra/lib/Hydra/Controller/Root.pm
@@ -180,6 +180,27 @@ sub releasesets :Local {
 }
 
 
+sub attrsToSQL {
+    my ($attrs, $id) = @_;
+    my @attrs = split / /, $attrs;
+
+    my $query = "1 = 1";
+
+    foreach my $attr (@attrs) {
+        $attr =~ /^([\w-]+)=([\w-]*)$/ or die "invalid attribute in release set: $attr";
+        my $name = $1;
+        my $value = $2;
+        # !!! Yes, this is horribly injection-prone... (though
+        # name/value are filtered above).  Should use SQL::Abstract,
+        # but it can't deal with subqueries.  At least we should use
+        # placeholders.
+        $query .= " and (select count(*) from buildinputs where build = $id and name = '$name' and value = '$value') = 1";
+    }
+
+    return $query;
+}
+
+
 sub releases :Local {
     my ($self, $c, $projectName, $releaseName) = @_;
     $c->stash->{template} = 'releases.tt';
@@ -196,10 +217,13 @@ sub releases :Local {
     return error($c, "Release set $releaseName doesn't have a primary job.") if !defined $primaryJob;
 
     $c->stash->{jobs} = [$releaseSet->releasesetjobs->search({}, {order_by => "isprimary DESC"})];
-    
+
     my @primaryBuilds = $project->builds->search(
         { attrname => $primaryJob->job, finished => 1 },
-        { join => 'resultInfo', order_by => "timestamp DESC", '+select' => ["resultInfo.releasename"], '+as' => ["releasename"] });
+        { join => 'resultInfo', order_by => "timestamp DESC"
+        , '+select' => ["resultInfo.releasename"], '+as' => ["releasename"]
+        , where => \ attrsToSQL($primaryJob->attrs, "me.id")
+        });
 
     my @releases = ();
 
@@ -220,7 +244,9 @@ sub releases :Local {
                 ($thisBuild) = $primaryBuild->dependentBuilds->search(
                     { attrname => $job->job, finished => 1 },
                     { join => 'resultInfo', rows => 1
-                    , order_by => ["buildstatus", "timestamp"] });
+                    , order_by => ["buildstatus", "timestamp"]
+                    , where => \ attrsToSQL($job->attrs, "build.id")
+                    });
             }
 
             if ($job->mayfail != 1) {
diff --git a/src/Hydra/root/releases.tt b/src/Hydra/root/releases.tt
index 5a13e1f5..4c1e16ad 100644
--- a/src/Hydra/root/releases.tt
+++ b/src/Hydra/root/releases.tt
@@ -1,10 +1,8 @@
-[% WRAPPER layout.tt title="Releases" %]
+[% WRAPPER layout.tt title="Release Set ‘$releaseSet.project.name:$releaseSet.name’" %]
 [% PROCESS common.tt %]
 [% USE HTML %]
 
-<h1>Releases</h1>
-
-<!-- <p>Description: [% releaseSet.description %]</p> -->
+<h1>Release Set <tt>[% releaseSet.project.name %]:[% releaseSet.name %]</tt></h1>
 
 <table class="tablesorter">
   <thead>