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

Timestamp:

01/02/11 18:20:04 (13 years ago)

Author:

nanardon

Message:

• allow to filter rpm list in distrib/

Location:

server/trunk/web/lib/Sophie/Controller

Files:

• Distrib.pm (modified) (3 diffs)
• Search/Rpms.pm (modified) (2 diffs)

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

@@ -321 +321 @@
     }
 
-    @{$c->stash->{rpm}} = map {
-            { 
-              pkgid => $_->pkgid,
-              filename => $_->filename,
-            }
-        }
-        $c->forward('distrib_rs', [ $distribution ])
-        ->search_related('MediasPaths')
-        ->search_related('Paths')
-        ->search_related('Rpmfiles', {}, { order_by => qw(filename) })
-        ->all;
+    $c->stash->{rpm} = [ map {
+        {
+        pkgid => $_->pkgid,
+        filename => $_->filename,
+        }
+        } $c->forward('/search/rpms/rpms_rs', [ $distribution ])
+        ->search(
+            {
+                $c->req->param('fl')
+                    ? ( filename => { ILIKE => $c->req->param('fl') . '%' } )
+                    : (),
+            }, { order_by => [ qw(filename) ] })
+        ->all ];
 
     $c->stash->{xmlrpc} = $c->stash->{rpm};
@@ -371 +373 @@
     }
 
+    $distribution->{src} = 0;
+
     $c->stash->{rpm} = [ map {
-            { 
-              pkgid => $_->pkgid,
-              filename => $_->filename,
-            }
-        }
-        $c->forward('distrib_rs', [ $distribution ])
-        ->search_related('MediasPaths')
-        ->search_related('Paths')
-        ->search_related('Rpmfiles', {
-            pkgid => {
-                IN => $c->model('Base')->resultset('Rpms')
-                ->search({ issrc => 'false' })->get_column('pkgid') ->as_query }
-        },
-        { order_by => [ qw(filename) ] }
-        )->all ];
+        {
+        pkgid => $_->pkgid,
+        filename => $_->filename,
+        }
+        } $c->forward('/search/rpms/rpms_rs', [ $distribution ])
+        ->search(
+            {
+                $c->req->param('fl')
+                    ? ( filename => { ILIKE => $c->req->param('fl') . '%' } )
+                    : (),
+            }, { order_by => [ qw(filename) ] })
+        ->all ];
 
     $c->stash->{xmlrpc} = $c->stash->{rpm};
@@ -426 +427 @@
     }
 
-    @{$c->stash->{rpm}} = map {
-            { 
-              pkgid => $_->pkgid,
-              filename => $_->filename,
-            }
-        }
-        $c->forward('distrib_rs', [ $distribution ])
-        ->search_related('MediasPaths')
-        ->search_related('Paths')
-        ->search_related('Rpmfiles', {
-            pkgid => {
-                IN => $c->model('Base')->resultset('Rpms')
-                ->search({ issrc => 'true' })->get_column('pkgid') ->as_query }
-        },
-        { order_by => [ qw(filename) ] }
-        )->all;
+    $distribution->{src} = 1;
+
+    $c->stash->{rpm} = [ map {
+        {
+        pkgid => $_->pkgid,
+        filename => $_->filename,
+        }
+        } $c->forward('/search/rpms/rpms_rs', [ $distribution ])
+        ->search(
+            {
+                $c->req->param('fl')
+                    ? ( filename => { ILIKE => $c->req->param('fl') . '%' } )
+                    : (),
+            }, { order_by => [ qw(filename) ] })
+        ->all ];
 
     $c->stash->{xmlrpc} = $c->stash->{rpm};

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

@@ -55 +55 @@
                 select => [qw(filename pkgid name shortname version arch label) ],
                 as => [qw(filename pkgid distribution dist release arch media) ],
-                rows => $searchspec->{rows} || 10000,
+                rows => $searchspec->{rows} || 30000,
                 order_by => [ 'Rpmfiles.added desc' ],
             },
@@ -173 +173 @@
 
     $c->stash->{rs} =
-        $c->forward('rpms_rs')->search(
+        $c->forward('rpms_rs', [ $searchspec ])->search(
         {
             filename => { LIKE => $file },