Changeset 349

Timestamp:

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

Author:

nanardon

Message:

• factorize and optimize code

Location:

server/trunk/web

Files:

• lib/Sophie/Base/Result/Deps.pm (modified) (1 diff)
• lib/Sophie/Base/Result/MediasPaths.pm (modified) (1 diff)
• lib/Sophie/Base/Result/RpmFile.pm (modified) (1 diff)
• lib/Sophie/Base/Result/Rpms.pm (modified) (1 diff)
• lib/Sophie/Controller/Distrib.pm (modified) (2 diffs)
• lib/Sophie/Controller/Search.pm (modified) (2 diffs)
• lib/Sophie/Controller/Search/Rpm.pm (modified) (2 diffs)
• lib/Sophie/Model/BaseSearch.pm (added)
• t/model_BaseSearch.t (added)

server/trunk/web/lib/Sophie/Base/Result/Deps.pm

@@ -10 +10 @@
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');
 
-
+__PACKAGE__->add_relationship( RpmFile => 'Sophie::Base::Result::RpmFile',
+                             { pkgid => 'pkgid' });
 1;

server/trunk/web/lib/Sophie/Base/Result/MediasPaths.pm

@@ -10 +10 @@
 __PACKAGE__->belongs_to(Medias => 'Sophie::Base::Result::Medias', 'd_media');
 __PACKAGE__->belongs_to(Paths => 'Sophie::Base::Result::Paths', 'd_path');
+__PACKAGE__->add_relationship( RpmFiles => 'Sophie::Base::Result::RpmFile',
+                             { 'foreign.d_path' => 'self.d_path' });
 
 

server/trunk/web/lib/Sophie/Base/Result/RpmFile.pm

@@ -10 +10 @@
 __PACKAGE__->belongs_to(Path => 'Sophie::Base::Result::Paths', 'd_path');
 __PACKAGE__->belongs_to(Rpms => 'Sophie::Base::Result::Rpms', 'pkgid');
-#__PACKAGE__->has_many(mediaspaths => 'Sophie::Base::Result::MediasPaths', 'path');
 
+__PACKAGE__->add_relationship(  MediasPaths => 'Sophie::Base::Result::MediasPaths',
+                              { 'foreign.d_path' => 'self.d_path' });
+
+__PACKAGE__->add_relationship(  Deps => 'Sophie::Base::Result::Deps',
+                              { 'foreign.pkgid' => 'self.pkgid' });
+__PACKAGE__->add_relationship(  Files => 'Sophie::Base::Result::Files',
+                              { 'foreign.pkgid' => 'self.pkgid' });
+__PACKAGE__->add_relationship(  BinFiles => 'Sophie::Base::Result::BinFiles',
+                              { 'foreign.pkgid' => 'self.pkgid' });
+__PACKAGE__->add_relationship(  SrcFiles => 'Sophie::Base::Result::SrcFiles',
+                              { 'foreign.pkgid' => 'self.pkgid' });
+__PACKAGE__->add_relationship(  Tags => 'Sophie::Base::Result::Tags',
+                              { 'foreign.pkgid' => 'self.pkgid' });
 
 1;

server/trunk/web/lib/Sophie/Base/Result/Rpms.pm

@@ -11 +11 @@
 __PACKAGE__->has_many(Deps => 'Sophie::Base::Result::Deps', 'pkgid');
 __PACKAGE__->has_many(Files => 'Sophie::Base::Result::Files', 'pkgid');
+__PACKAGE__->has_many(BinFiles => 'Sophie::Base::Result::BinFiles', 'pkgid');
 __PACKAGE__->has_many(SrcFiles => 'Sophie::Base::Result::SrcFiles', 'pkgid');
 __PACKAGE__->has_many(Tags => 'Sophie::Base::Result::Tags', 'pkgid');

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' ],
         }
     );