r2729 - in people/goneri/SvnBuildStat-WWW: ! dirs' list truncated !
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Sun May 27 22:47:34 UTC 2007
Author: goneri-guest
Date: 2007-05-27 22:47:34 +0000 (Sun, 27 May 2007)
New Revision: 2729
Modified:
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/.Packages.pm.swp
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
people/goneri/SvnBuildStat-WWW/root/src/packages/.main.tt2.swp
people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db-tarball.pl
Log:
use of a SQL view to prepare the HTML view
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/.Packages.pm.swp
===================================================================
(Binary files differ)
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-27 22:29:34 UTC (rev 2728)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-27 22:47:34 UTC (rev 2729)
@@ -54,63 +54,69 @@
if ($param =~ /\@/) {
$maintainer = $c->model('SvnBuildStat::WWW::Model::DB::Maintainer')->search({email => $param})->first;
$c->stash->{maintainer} = $maintainer;
+
my $packagemaintainer_rs = $c->model('SvnBuildStat::WWW::Model::DB::PackageMaintainer')->search({maintainer_id => $maintainer->id});
- $package_rs = $packagemaintainer_rs->search_related("package_id");
+
+ my @package_id;
+ while (my $packagemaintainer = $packagemaintainer_rs->next) {
+ push @package_id, $packagemaintainer->package_id->id;
+ }
+ $c->stash->{packages} = [ $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({ package_id => { '-in' => \@package_id } },{order_by=>"name"}) ];
} elsif ($param =~ /^\d+$/) {
- $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({repository_id => $param}, {order_by => 'name'});
-
+# $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({repository_id => $param}, {order_by => 'name'});
+ $c->stash->{packages} = [ $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({ repository_id => $param },{order_by=>"name"}) ];
} else { # I don't want to kill my server with to much request
$c->response->redirect($c->uri_for('/repositorys/list'));
return;
}
- $c->stash->{packages} = [];
- while (my $package = $package_rs->next) {
- my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search (
- {package_id => $package->id, isbuildinprogress => 'false'}, {id => 'rev ASC'})->first;
+# $c->stash->{packages} = [];
+# while (my $package = $package_rs->next) {
+# my $build = $c->model('SvnBuildStat::WWW::Model::DB::Build')->search (
+# {package_id => $package->id, isbuildinprogress => 'false'}, {id => 'rev ASC'})->first;
+#
+# my $needbuild = 1;
+# my $lintianerrcount;
+# my $lindaerrcount;
+# my $buildok;
+# my $bugcount;
+# my $bugerror;
+# my $buildisok;
+# my $piupartsisok;
+# if ($build) {
+# $buildisok = 1 if $build->buildisok;
+# $needbuild = 0 if $build->rev >= $package->rev;
+# $piupartsisok = 1 if $build->piupartsisok;
+# $lintianerrcount = $c->model('SvnBuildStat::WWW::Model::DB::BuildLintian')->search (
+# {build_id => $build->id})->count;
+# $lindaerrcount= $c->model('SvnBuildStat::WWW::Model::DB::BuildLinda')->search (
+# {build_id => $build->id})->count;
+# }
+# my $bug_rs = $c->model('SvnBuildStat::WWW::Model::DB::Bug')->search(package_id => $package->id);
+# $bugcount = $bug_rs->count;
+# while (my $bug = $bug_rs->next) {
+# $bugerror = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
+# }
+#
+# push @{$c->stash->{packages}}, {
+#
+# name => $package->name,
+# istarballpresent => $package->istarballpresent,
+# isindebian => $package->isindebian,
+# needbuild => $needbuild,
+# lintianerrcount => $lintianerrcount,
+# lindaerrcount => $lindaerrcount,
+# bugcount => $bugcount,
+# bugerror => $bugerror,
+# buildisok => $buildisok,
+# piupartsisok => $piupartsisok,
+# isindebian => $package->isindebian,
+# svndebrelease => $package->svndebrelease,
+#
+# };
+# }
- my $needbuild = 1;
- my $lintianerrcount;
- my $lindaerrcount;
- my $buildok;
- my $bugcount;
- my $bugerror;
- my $buildisok;
- my $piupartsisok;
- if ($build) {
- $buildisok = 1 if $build->buildisok;
- $needbuild = 0 if $build->rev >= $package->rev;
- $piupartsisok = 1 if $build->piupartsisok;
- $lintianerrcount = $c->model('SvnBuildStat::WWW::Model::DB::BuildLintian')->search (
- {build_id => $build->id})->count;
- $lindaerrcount= $c->model('SvnBuildStat::WWW::Model::DB::BuildLinda')->search (
- {build_id => $build->id})->count;
- }
- my $bug_rs = $c->model('SvnBuildStat::WWW::Model::DB::Bug')->search(package_id => $package->id);
- $bugcount = $bug_rs->count;
- while (my $bug = $bug_rs->next) {
- $bugerror = 1 if ($bug->severity_id->name =~ /important|serious|grave|critical/);
- }
-
- push @{$c->stash->{packages}}, {
-
- name => $package->name,
- istarballpresent => $package->istarballpresent,
- isindebian => $package->isindebian,
- needbuild => $needbuild,
- lintianerrcount => $lintianerrcount,
- lindaerrcount => $lindaerrcount,
- bugcount => $bugcount,
- bugerror => $bugerror,
- buildisok => $buildisok,
- piupartsisok => $piupartsisok,
- isindebian => $package->isindebian,
- svndebrelease => $package->svndebrelease,
-
- };
- }
-
$c->stash->{template} = 'packages/main.tt2';
}
Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/.main.tt2.swp
===================================================================
(Binary files differ)
Modified: people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2
===================================================================
--- people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2 2007-05-27 22:29:34 UTC (rev 2728)
+++ people/goneri/SvnBuildStat-WWW/root/src/packages/main.tt2 2007-05-27 22:47:34 UTC (rev 2729)
@@ -15,19 +15,19 @@
</h1>
<table>
-<tr><th>Packages</th><th>Status</th><th>Linda</th><th>Lintian</th><th>Bugs</th><th>Piuparts</th><th>Synced w/Debian?</th></tr>
+<tr><th>Packages</th><th>Status</th><th>Linda</th><th>Lintian</th><th>Bugs</th><th>Piuparts</th><th>Synced<br />Debian?</th><th>Synced<br />with<br />Upstream</th></tr>
[% # Display each book in a table row %]
[% FOREACH package IN packages -%]
<tr>
<td>
<a href="[% Catalyst.uri_for('info/') _ package.name %]"><strong>[% package.name %]</strong></a>
</td>
- <td [% IF !package.istarballpresent || (!package.needbuild && !package.buildisok) %]class="error"[% END %] [% IF package.buildisok %]class="ok"[% END %]>
+ <td [% IF !package.istarballpresent || (!package.buildisok) %]class="error"[% END %] [% IF package.buildisok %]class="ok"[% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF ! package.istarballpresent %]
No tarball
[% ELSE %]
- [% IF package.needbuild %]
+ [% IF ! package.builded %]
Need build
[% ELSE %]
[% IF package.buildisok %]
@@ -39,29 +39,34 @@
[% END %]
</a>
</td>
- <td [% IF package.lintianerrcount > 0 %]class="error"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="ok"[% END %][% END %]>
+ <td [% IF package.lintianerrcount > 0 %]class="error"[% ELSE %][% IF package.lintiancount > 0 %]class="warning"[% ELSE %][% IF package.buildisok %]class="ok"[% END %][% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% IF package.lintianerrcount > 0 %][% package.lintianerrcount %][% END %]
+ [% IF package.lintiancount > 0 %][% package.lintiancount %][% END %]
</a>
</td>
- <td [% IF package.lindaerrcount > 0 %]class="error"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="ok"[% END %][% END %]>
+ <td [% IF package.lindaerrcount > 0 %]class="error"[% ELSE %][% IF package.lindacount > 0 %]class="warning"[% ELSE %][% IF package.buildisok %]class="ok"[% END %][% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% IF package.lindaerrcount > 0 %][% package.lindaerrcount %][% END %]
+ [% IF package.lindacount > 0 %][% package.lindacount %][% END %]
</a>
</td>
- <td [% IF ! package.bugcount %]class="ok"[% ELSE %][% IF package.bugerror %]class="error"[% ELSE %]class="warning"[% END %][% END %]>
+
+
+ <td [% IF package.bugcount == 0 %]class="ok"[% ELSE %][% IF package.bugmaxseverity > 3 %]class="error"[% ELSE %]class="warning"[% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF package.bugcount > 0 %][% package.bugcount %][% END %]
</a>
</td>
- <td [% IF package.piupartsisok %]class="ok"[% ELSE %][% IF ! package.needbuild && package.buildisok %]class="error"[% END %][% END %]>
+ <td [% IF package.piupartsisok %]class="ok"[% ELSE %][% IF package.buildisok %]class="error"[% END %][% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
[% IF ! package.needbuild && package.buildisok %][% IF package.piupartsisok %]Succeed[% ELSE %]Failed[% END %][% END %]
</a>
</td>
- <td>
+ <td [% IF package.isindebian %]class="ok"[% ELSE %]class="warning"[% END %]>
+ [% IF ! package.isindebian %]No[% END %]
+ </td>
+ <td [% IF package.isuptodate %]class="ok"[% ELSE %]class="error"[% END %]>
<a href="[% Catalyst.uri_for('info/') _ package.name %]">
- [% IF ! package.isindebian %]No[% END %]
+ [% IF ! package.isuptodate %]No[% END %]
</a>
</td>
</tr>
Modified: people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db-tarball.pl
===================================================================
--- people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db-tarball.pl 2007-05-27 22:29:34 UTC (rev 2728)
+++ people/goneri/SvnBuildStat-WWW/script/svnbuildstat_update-db-tarball.pl 2007-05-27 22:47:34 UTC (rev 2729)
@@ -64,7 +64,6 @@
$istarballpresent = 1;
$$package->tarballuri('@DEBMIRROR@/pool/'.$section.$tmp.'/'.$tarball);
print "OK in Debian\n";
- $$package->update();
last;
}
}
More information about the Pkg-games-commits
mailing list