Changeset 130 for server/trunk/web/lib/Sophie/Controller/Search.pm

Timestamp:

12/17/10 13:23:21 (13 years ago)

Author:

nanardon

Message:

• allow using glob like search on dirname part

File:

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

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

@@ -381 +381 @@
     my ( $self, $c, $searchspec, $file) = @_;
     my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
+    $dirname =~ m:^[/]: or $dirname = undef;
+    if (!$dirname) {
+        if ($file =~ /(\*|\?)/) {
+            $file =~ tr/*?/%_/;
+        } else {
+            $file = '%' . $file;
+        }
+    }
     $searchspec ||= {};
 
@@ -391 +399 @@
                     ? (dirname => $dirname)
                     : ()),
+                { 'dirname || basename' => { LIKE => $file } },
                 basename => $basename,
                 ($searchspec->{content} ? { has_content => 1 } : ()),
@@ -434 +443 @@
 sub byfile : XMLRPCPath('/search/rpm/byfile') {
     my ( $self, $c, $searchspec, $file) = @_;
-    my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
     $searchspec ||= {};
     my $distrs = $c->forward('distrib_search', [ $searchspec, 1 ]);
@@ -547 +555 @@
 sub file_search : XMLRPCPath('/search/file/byname') {
     my ( $self, $c, $searchspec, $file) = @_;
-    my ($dirname, $basename) = $file =~ m:^(.*/)?([^/]+)$:;
     $searchspec ||= {};