Changeset 349 for server/trunk/web/lib/Sophie/Controller

Timestamp:

01/25/11 23:46:51 (13 years ago)

Author:

nanardon

Message:

• factorize and optimize code

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Distrib.pm (modified) (2 diffs)
• Search.pm (modified) (2 diffs)
• Search/Rpm.pm (modified) (2 diffs)

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

@@ -104 +104 @@
                 $distrib->{distribution}
                     ? (-or => [
-                            { name =>      $distrib->{distribution} },
+                            { 'me.name' =>      $distrib->{distribution} },
                             { shortname => $distrib->{distribution} },
                         ],
@@ -125 +125 @@
             {
                 $distrib->{arch}
-                    ? (arch => $distrib->{arch})
+                    ? ('Arch.arch' => $distrib->{arch})
                     : ()
             },

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

@@ -191 +191 @@
     my ($self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
 
-    my $distrs = $c->forward('distrib_search', [ $searchspec, 1 ]);
-
-    return $c->model('Base::Deps')->search(
+        $c->model('BaseSearch')->best_rpm_filter($searchspec)
+        ->search({}, { join => [ 'Deps' ]})->search(
         {
             -and => [
@@ -200 +199 @@
             ($depsense
                 ? ({-nest => \[
-                    'rpmdepmatch(flags, evr, rpmsenseflag(?), ?)',
+                    'rpmdepmatch(Deps.flags, Deps.evr, rpmsenseflag(?), ?)',
                     [ plain_text => $depsense],
                     [ plain_text => $depevr ]
                 ]})
             : ()),
-            ($distrs 
-                ? ({ pkgid => { IN => $distrs->get_column('pkgid')->as_query,
-                        },})
-                : ()),
-            (exists($searchspec->{src})
-                ? { pkgid => { IN => $c->model('Base::Rpms')->search(
-                            { issrc => $searchspec->{src} ? 1 : 0 }
-                        )->get_column('pkgid')->as_query, }, }
-                : ()),
             ($searchspec->{pkgid}
-                ? { pkgid => $searchspec->{pkgid} }
+                ? { 'Deps.pkgid' => $searchspec->{pkgid} }
                 : ()),
             ]
         },
         {
-            '+select' => [ { rpmsenseflag => 'flags' }, 'depname', ],
+            '+select' => [ { rpmsenseflag => 'Deps.flags' }, 'Deps.depname', ],
             '+as'     => [ qw(sense name) ],
 

server/trunk/web/lib/Sophie/Controller/Search/Rpm.pm

@@ -97 +97 @@
     $searchspec ||= {};
 
-    my $distrs = $c->forward('/search/distrib_search', [ $searchspec, 1 ]);
+    #my $distrs = $c->forward('/search/distrib_search', [ $searchspec, 1 ]);
 
     my $deprs = $c->forward(
@@ -113 +113 @@
             order_by => [ 'name', 'evr using >>', 'issrc', 'arch' ],
             rows => $searchspec->{rows},
+            select => [ 'pkgid' ],
+            as => [ 'pkgid' ],
         }
     );