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

Timestamp:

01/26/11 02:29:37 (13 years ago)

Author:

nanardon

Message:

• optimize in a fester way

Location:

server/trunk/web/lib/Sophie/Controller

Files:

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

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

@@ -191 +191 @@
     my ($self, $c, $searchspec, $deptype, $depname, $depsense, $depevr ) = @_;
 
-        $c->model('BaseSearch')->best_rpm_filter($searchspec)
-        ->search({}, { select => [], join => [ 'Deps' ]})->search(
+        my $rs = $c->model('Base::Deps')->search(
         {
             -and => [
@@ -199 +198 @@
             ($depsense
                 ? ({-nest => \[
-                    'rpmdepmatch(Deps.flags, Deps.evr, rpmsenseflag(?), ?)',
+                    'rpmdepmatch(flags, me.evr, rpmsenseflag(?), ?)',
                     [ plain_text => $depsense],
                     [ plain_text => $depevr ]
@@ -205 +204 @@
             : ()),
             ($searchspec->{pkgid}
-                ? { 'Deps.pkgid' => $searchspec->{pkgid} }
+                ? { 'pkgid' => $searchspec->{pkgid} }
                 : ()),
             ]
         },
         {
-            '+select' => [ { rpmsenseflag => 'Deps.flags' }, 'Deps.depname',
-                'Deps.evr' ],
+            '+select' => [ { rpmsenseflag => 'flags' }, 'depname',
+                'me.evr' ],
             '+as'     => [ qw(sense name evr) ],
 
         }
     );
+    if (exists($searchspec->{src})) {
+        $rs = $rs->search_related('Rpms',
+            { issrc => $searchspec->{src} ? 1 : 0 }
+        )
+    }
+    return $c->model('BaseSearch')->apply_rpm_filter($rs, $searchspec);
 }
 
@@ -231 +236 @@
     $searchspec ||= {};
 
-    $c->model('BaseSearch')->best_rpm_filter($searchspec)
-        ->search({}, { select => [], join => [ 'Files' ]})->search(
+    my $rs = $c->model('Base::Files')->search(
         {
             -and => [
@@ -242 +246 @@
                 ($searchspec->{content} ? { has_content => 1 } : ()),
                 ($searchspec->{pkgid}
-                    ? { 'Files.pkgid' => { IN => $searchspec->{pkgid} } }
+                    ? { 'pkgid' => { IN => $searchspec->{pkgid} } }
                     : ()),
             ],
@@ -248 +252 @@
         {
             '+select' => [
-                'Files.contents is NOT NULL as has_content',
+                'contents is NOT NULL as has_content',
                 { rpmfilesmode => 'mode' },
-                map { 'Files.' . $_ } $c->model('Base::Files')->result_source->columns,
             ],
-            '+as' => [ qw(has_content perm),
-                $c->model('Base::Files')->result_source->columns ],
-        }
-    );
+            '+as' => [ qw(has_content perm), ]
+        }
+    );
+    if (exists($searchspec->{src})) {
+        $rs = $rs->search_related('Rpms',
+            { issrc => $searchspec->{src} ? 1 : 0 }
+        )
+    }
+    return $c->model('BaseSearch')->apply_rpm_filter($rs, $searchspec);
 }
 

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

@@ -104 +104 @@
             $depsense, $depevr 
         ],
-    )->get_column('Deps.pkgid');
+    )->get_column('me.pkgid');
     $c->stash->{rs} = $c->model('Base::Rpms')->search(
         {
@@ -135 +135 @@
 
     my $filers = $c->forward('/search/file_rs', [ $searchspec, $file ])
-        ->get_column('Files.pkgid');
+        ->get_column('me.pkgid');
     $c->stash->{rs} = $c->model('Base::Rpms')->search(
         {