Changeset 88 for server/trunk/web/lib/Sophie

Timestamp:

12/06/10 15:06:31 (14 years ago)

Author:

nanardon

Message:

• improve and fix file search function

File:

• server/trunk/web/lib/Sophie/Controller/Search.pm (modified) (3 diffs)

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

@@ -442 +442 @@
     $searchspec ||= {};
 
+    my @col = qw(dirname basename md5 size pkgid count);
     my $filers = $c->stash->{rs} = $c->model('Base::Files')
     ->search(
@@ -450 +451 @@
                     : ()),
                 basename => $basename,
+                ($searchspec->{content} ? { has_content => 1 } : ()),
                 pkgid => {
                     IN => $c->forward('distrib_search',
@@ -455 +457 @@
                 },
             ],
+        },
+        {
+            'select' => [ 'contents is NOT NULL as has_content',
+                'rpmfilesmode(mode) as perm', @col, '"group"',
+                '"user"' ],
+            as => [ qw(has_content perm), @col,
+                'group', 'user' ],
         }
     );
     
-    $c->stash->{column} = \qw(basename);
+    $c->stash->{column} = [
+        @col, qw(has_content perm user group)
+    ];
     
     $c->forward('format_search', $searchspec);