Changeset 286

Timestamp:

01/09/11 19:28:34 (13 years ago)

Author:

nanardon

Message:

• fix load_rpm when rpm is a source rpm
• link rpm to session or user according user is login or not

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Analysis.pm (modified) (2 diffs)
• User/Folder.pm (modified) (2 diffs)

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

@@ -77 +77 @@
 
 sub find_requirements : XMLRPC {
-    my ($self, $c, $string) = @_;
-
-    my $id = $c->forward('/user/folder/load_rpm', [ $string ]);
+    my ($self, $c, $distspec, $id, $over, $pool) = @_;
 
     my @deplist;
@@ -100 +98 @@
     }
 
-    $c->forward('/analysis/solver/find_requirements', [ {}, 'P', \@deplist, $id ]);
+    $c->forward('/analysis/solver/find_requirements',
+        [ $distspec, 'P', \@deplist, $id, $pool ]);
 }
 

server/trunk/web/lib/Sophie/Controller/User/Folder.pm

@@ -113 +113 @@
                 $tags->{Release}{string}[0],
             ),
-            user_fkey => $User,
-            sessions_fkey => 'session:' . $c->sessionid,
+            user_fkey => ($User ? $User->ukey : undef),
+            sessions_fkey => ($User ? undef : 'session:' . $c->sessionid),
             pkgid => $pkgid,
         }
@@ -125 +125 @@
                     pid => $newrpm->id,
                     basename => $tags->{Basenames}{string}[$fcount],
-                    dirname  => $tags->{Dirnames}{string}[
-                        $tags->{Dirindexes}{integer}[$fcount]
-                    ],
+                    dirname  => (ref $tags->{Sourcerpm}
+                        ? $tags->{Dirnames}{string}[$tags->{Dirindexes}{integer}[$fcount]]
+                        : ''),
                 }
             );