[Cpan-forum-commit] rev 329 - in trunk: . lib/CPAN/Forum/RM

[svn at pti.co.il]

Author: gabor
Date: 2007-08-13 21:43:39 +0300 (Mon, 13 Aug 2007)
New Revision: 329

Modified:
   trunk/
   trunk/lib/CPAN/Forum/RM/Search.pm
Log:
separate the _search_users method



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4410
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4411
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752

Modified: trunk/lib/CPAN/Forum/RM/Search.pm
===================================================================
--- trunk/lib/CPAN/Forum/RM/Search.pm	2007-08-13 18:43:01 UTC (rev 328)
+++ trunk/lib/CPAN/Forum/RM/Search.pm	2007-08-13 18:43:39 UTC (rev 329)
@@ -99,16 +99,9 @@
     }
 
     if ($what eq "module" or $what eq "pauseid") {
-        $any_result = $self->_search_modules($t, $what, $name);
+        $any_result = $self->_search_modules($t, $name, $what);
     } elsif ($what eq "user") {
-        my @things;
-        my $it =  CPAN::Forum::DB::Users->search_like(username => '%' . lc($name) . '%');
-        while (my $user  = $it->next) {
-            push @things, {username => $user->username};
-        }
-        $any_result = 1 if @things;
-        $t->param(users => \@things);
-        $t->param($what => 1);
+        $any_result = $self->_search_users($t, $name, $what);
     } else {
         my %where;
         if ($what eq "subject") { %where = (subject => {'LIKE', '%' . $name . '%'}); }
@@ -128,7 +121,7 @@
 }
 
 sub _search_modules {
-    my ($self, $t, $what, $name) = @_;
+    my ($self, $t, $name, $what) = @_;
 
     my $it;
     if ($what eq "module") {
@@ -151,6 +144,18 @@
     return @things ? 1 : 0;
 }
 
+sub _search_users {
+    my ($self, $t, $name, $what) = @_;
 
+    my @things;
+    my $it =  CPAN::Forum::DB::Users->search_like(username => '%' . lc($name) . '%');
+    while (my $user  = $it->next) {
+        push @things, {username => $user->username};
+    }
+    $t->param(users => \@things);
+    $t->param($what => 1);
+    return @things ? 1 : 0;
+}
+
 1;