Changeset 105

Timestamp:

12/10/10 00:27:51 (13 years ago)

Author:

nanardon

Message:

• optimize a bit explorer

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/0Explorer.pm (modified) (4 diffs)
• root/templates/html/0explorer/file.tt (modified) (1 diff)

server/trunk/web/lib/Sophie/Controller/0Explorer.pm

@@ -28 +28 @@
     $c->stash->{explorerurl} = '/explorer' . ($dir ? "/$dir" : '');
 
-    my $rsdist = $c->forward('/search/distrib_search', [ $c->session->{__explorer} ]);
+    my $rsdist = $c->forward('/search/distrib_search', [
+            $c->session->{__explorer}, 1 ]);
     $c->stash->{xmlrpc} = [ $c->model('Base')
       ->resultset('Files')
@@ -34 +35 @@
           {
               dirname => '/' . ($dir ? "$dir/" : ''),
-              (grep { $_ } values %{ $c->session->{__explorer} }
-                ? (pkgid => { IN => $rsdist->get_column('pkgid')->as_query, })
+              ($rsdist 
+                ? (pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },)
                 : ()),
               ($c->req->param('filename')
@@ -56 +57 @@
     $c->stash->{explorerurl} = '/explorer' . ($dir ? "/$dir" : '');
 
-    my $rsdist = $c->forward('/search/distrib_search', [ $c->session->{__explorer} ]);
+    my $rsdist = $c->forward('/search/distrib_search', [
+            $c->session->{__explorer}, 1 ]);
 
     my @col = qw(dirname basename md5 size pkgid count);
@@ -67 +69 @@
       ->search({
               dirname => '/' . ($dir ? "$dir/" : ''), basename => $basename,
-              pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },
+              ($rsdist 
+                ? (pkgid => { IN => $rsdist->get_column('pkgid')->as_query, },)
+                : ())
           },
           { 

server/trunk/web/root/templates/html/0explorer/file.tt

@@ -7 +7 @@
 <table>
 [% END %]
-[% info = c.forward('/rpms/info', [ file.pkgid ]) %]
+[% info = c.forward('/rpms/basicinfo', [ file.pkgid ]) %]
 <tr><td colspan="6">
 <a href="[% c.uri_for('/rpms', file.pkgid) %]">