Changeset 314

Timestamp:

01/16/11 05:46:06 (13 years ago)

Author:

nanardon

Message:

• add functions

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Analysis.pm (modified) (2 diffs)
• Analysis/Solver.pm (modified) (2 diffs)

server/trunk/web/lib/Sophie/Controller/Analysis.pm

@@ -102 +102 @@
 }
 
+sub find_obsoletes : XMLRPC {
+    my ($self, $c, $distspec, $id, $pool) = @_;
+    $pool ||= $id;
+    my @provides;
+    foreach my $dep ($c->model('Base::UsersDeps')->search(
+        {
+            pid => [ $id ],
+            deptype => 'O',
+        },
+        {
+            select => [ 'rpmsenseflag("flags")',
+                qw(depname flags evr deptype) ],
+            as => [ qw'sense depname flags evr deptype' ],
+        }
+        )->all) {
+        $dep->get_column('depname') =~ /^rpmlib\(/ and next;
+        push(@provides, [
+                $dep->get_column('depname'),
+                $dep->get_column('sense'),
+                $dep->get_column('evr') ]);
+    }
+    $c->forward('/analysis/solver/find_obsoletes',
+        [ $distspec, \@deplist, $pool ]);
+}
+
 sub find_conflicts : XMLRPC {
     my ($self, $c, $distspec, $id, $pool) = @_;
@@ -144 +169 @@
     $c->forward('/analysis/solver/find_conflicts',
         [ $distspec, \@conflicts, \@provides, $pool ]);
+}
+
+sub find_updates : XMLRPC {
+    my ($self, $c, $distspec, $id, $pool) = @_;
+    my $pkg = $c->model('Base::UsersRpms')->find(
+        { id => $id }
+    );
+    $distspec->{src} = $pkg->issrc ? 1 : 0;
+
+    $c->forward('/analysis/solver/find_updates',
+        [ $distspec, [ $pkg->name, '<', $pkg->evr ], $pool ]
+    );
 }
 

server/trunk/web/lib/Sophie/Controller/Analysis/Solver.pm

@@ -122 +122 @@
 }
 
+sub solve_name : Private {
+    my ($self, $c, $searchspec, $deplist, $pool) = @_;
+    my %need_pkgid;
+    my %need_pool;
+    my %bydep;
+    my @unresolved;
+    foreach my $dep (@{$deplist || []}) {
+        my ($depname, $sense, $evr) = ref $dep
+            ? @$dep
+            : split(/\s+/, $dep);
+        $sense ||= '';
+        $evr ||= '';
+        my $depdisplay = $depname . ($sense ? " $sense $evr" : '');
+        my $found = 0;
+
+        my $res = $c->forward('/search/rpm/byname', [ $searchspec, $depname,
+                $sense, $evr ]);
+        foreach (@{ $res }) {
+            $found = 1;
+            $need_pkgid{$_} = 1;
+            $bydep{$depdisplay}{pkg}{$_} = 1;
+        }
+
+        if (!$found) {
+            push(@unresolved, $depdisplay);
+        }
+    }
+    foreach my $d (keys %bydep) {
+        foreach my $t (keys %{ $bydep{$d} || {} }) {
+            $bydep{$d}{$t} = [ keys %{ $bydep{$d}{$t} } ];
+        }
+    }
+    $c->stash->{xmlrpc} = {
+        unresolved => \@unresolved,
+        pkg => [ keys %need_pkgid ],
+        pool => [ keys %need_pool ],
+        bydep => \%bydep,
+    }
+}
+
 sub find_requirements : Private {
     my ($self, $c, $searchspec, $deplist, $pool) = @_;
@@ -144 +184 @@
 sub is_updated : Private {
     my ($self, $c, $searchspec, $deplist, $pool) = @_;
-    my $pkgid = $c->forward('/search/rpm/byname', [ $searchspec, @{ $deplist } ]);
-    $c->stash->{xmlrpc} = {
-        pkg => $pkgid,
-        pool => [],
-    }
+    $c->forward('solve_name', [ $searchspec, [ $deplist ] ], $pool);
+}
+
+sub find_obsoletes : Private {
+    my ($self, $c, $searchspec, $deplist, $pool) = @_;
+    $c->forward('solve_name', [ $searchspec,  $deplist ], $pool);
 }