Changeset 232 for server

Timestamp:

12/30/10 11:16:52 (13 years ago)

Author:

nanardon

Message:

• resurect Chat 'q' command

Location:

server/trunk/web

Files:

• lib/Sophie/Controller/Chat/Cmd.pm (modified) (1 diff)
• lib/Sophie/Controller/Search/Rpm.pm (modified) (1 diff)
• lib/Sophie/Controller/Search/Tags.pm (added)
• t/controller_Search-Rpms.t (modified) (1 diff)
• t/controller_Search-Tags.t (added)

server/trunk/web/lib/Sophie/Controller/Chat/Cmd.pm

@@ -163 +163 @@
 }
 
+=head2 q REGEXP
+
+Search rpm name matching C<REGEXP>.
+
+NB: C<.>, C<*>, C<+> have special meaning
+and have to be escaped.
+
+=cut
+
+sub q : XMLRPC {
+    my ($self, $c, $reqspec, @args) = @_;
+
+    $reqspec->{src} = 0;
+
+    @args = @{ $c->forward('_getopt', [
+        {
+            'd=s' => \$reqspec->{distribution},
+            'v=s' => \$reqspec->{release},
+            'a=s' => \$reqspec->{arch},
+            's'   => sub { $reqspec->{src} = 1 },
+        }, @args ]) };
+
+    my $res = $c->forward('/search/tags/name_regexp', $reqspec, $args[0]);
+    if (!@{ $res }) {
+        return $c->stash->{xmlrpc} = {
+            message => [ 'Nothing match `' . $args[0] . '\'' ]
+        };
+    } else {
+        my @message = 'rpm name matching `' . $args[0] . '\':';
+        while (@{ $res }) {
+            my $str = '';
+            do {
+                my $item = shift(@{ $res }) or last;
+                $str .= ', ' if ($str);
+                $str .= $item->{name};
+            } while (length($str) < 70);
+            push(@message, $str);
+        }
+        return $c->stash->{xmlrpc} = {
+            message => \@message,
+        };
+    }
+}
+
 =head2 version [-s] NAME
 

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

@@ -143 +143 @@
 }
 
-sub fuzzy : XMLRPCPath('fuzzy') {
+sub fuzzy : Private {
     my ($self, $c, $searchspec, $name) = @_;
-    $searchspec ||= {};
-
-    my $deprs = $c->model('Base')->resultset('Deps')->search(
-        { deptype => 'P', depname => { '~*' => $name } }
-    )->get_column('pkgid');
+    $c->forward('fuzzy_rpc', [ $searchspec, $name ]);
+    $c->stash->{xmlrpc} = 
+        [ $c->stash->{rs}->get_column('pkgid')->all ];
+}
+
+sub fuzzy_rpc : XMLRPCPath('fuzzy') {
+    my ($self, $c, $searchspec, $name) = @_;
+    $searchspec ||= {};
+
+    # my $deprs = $c->model('Base')->resultset('Deps')->search(
+    #    { deptype => 'P', depname => { '~*' => $name } }
+    # )->get_column('pkgid');
     my $distrs = $c->forward('/search/distrib_search', [ $searchspec, 1 ]);
 

server/trunk/web/t/controller_Search-Rpms.t

@@ -6 +6 @@
 BEGIN { use_ok 'Sophie::Controller::Search::Rpms' }
 
-# ok( request('/search/rpms')->is_success, 'Request should succeed' );
 done_testing();