r2733 - ! dirs' list truncated !
Gonéri Le Bouder
goneri-guest at alioth.debian.org
Sun May 27 23:32:46 UTC 2007
Author: goneri-guest
Date: 2007-05-27 23:32:46 +0000 (Sun, 27 May 2007)
New Revision: 2733
Modified:
people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
Log:
Improve the way package to build are detected
Modified: people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm
===================================================================
--- people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-27 23:19:08 UTC (rev 2732)
+++ people/goneri/SvnBuildStat-WWW/lib/SvnBuildStat/WWW/Controller/Packages.pm 2007-05-27 23:32:46 UTC (rev 2733)
@@ -71,52 +71,6 @@
}
-# $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,
-#
-# };
-# }
-
$c->stash->{template} = 'packages/main.tt2';
}
@@ -216,7 +170,6 @@
"arm|mips|mipsel|hppa|ia64|s390|amd64|".
"ppc64|sh|armeb|m32r|hurd-i386|kfreebsd-gnu)";
- my $ret;
if (!(defined ($arch) && $arch && $arch =~ /$archs/)) {
$c->response->body("missigin or invalid arch"); # Seems to create an error
@@ -224,48 +177,14 @@
}
my $archobj = $c->model('SvnBuildStat::WWW::Model::DB::Arch')->find_or_create ({name => $arch});
- my $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({istarballpresent => 'true'});
- return unless $package_rs->count;
- my $resp;
- my $cpt = int rand (10);
- while (my $package = $package_rs->next) {
+ $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Viewpackage')->search({istarballpresent => 'true'},{order_by=>"builded"});
- next unless $package->istarballpresent;
- # Build needed?
- next if ($c->model('SvnBuildStat::WWW::Model::DB::Build')->search ({
- package_id => $package->id,
- rev => { '>=', $package->rev }, # Work around because some old svn revision
- arch_id => $archobj->id
- })->count > 0);
- my $name = $package->name;
- my $tarballuri = $package->tarballuri;
- $tarballuri =~ s/\@PACKAGE@/$package->name/;
- $tarballuri =~ s/\@TARBALL@/$package->svndebrelease/;
-
- my $uri = $package->uri;
- my $tarball = mkTarballFromPackage(\$package);
-
- $resp = "$name;$tarballuri;$tarball;$uri";
- last if $cpt--<0; # the poor man randomizer
- }
-
- # TODO improve this (buggy) part.
- $package_rs = $c->model('SvnBuildStat::WWW::Model::DB::Package')->search ({istarballpresent => 'true'});
- return unless $package_rs->count;
-
- $cpt = int rand (10);
+ my $resp = '';
while (my $package = $package_rs->next) {
+ # TODO next unless arch is supported
- next unless $package->istarballpresent;
- # Build needed?
- next if ($c->model('SvnBuildStat::WWW::Model::DB::Build')->search ({
- package_id => $package->id,
- rev => { '>=', $package->rev }, # Work around because some old svn revision
- arch_id => $archobj->id,
- buildisok => 'true'
- })->count > 0);
my $name = $package->name;
my $tarballuri = $package->tarballuri;
@@ -276,10 +195,9 @@
my $tarball = mkTarballFromPackage(\$package);
$resp = "$name;$tarballuri;$tarball;$uri";
- last if $cpt--<0; # the poor man randomizer
+ last;
}
-
$c->response->body($resp);
}
=head1 AUTHOR
More information about the Pkg-games-commits
mailing list