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

[svn at pti.co.il]

Author: gabor
Date: 2007-08-13 21:44:14 +0300 (Mon, 13 Aug 2007)
New Revision: 330

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



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4411
8c4c90e1-83eb-0310-96eb-e7cb62807872:/local/cpan-forum:12752
   + 7bc34947-122d-0410-bc5a-f898d2bb5f81:/local/cpan-forum:4412
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:39 UTC (rev 329)
+++ trunk/lib/CPAN/Forum/RM/Search.pm	2007-08-13 18:44:14 UTC (rev 330)
@@ -74,7 +74,6 @@
     my $name   = $q->param("name")    || '';
     my $what   = $q->param("what")    || '';
     $name      =~ s/^\s+|\s+$//g;
-    my $any_result = 0;
 
     # kill the taint checking (why do I use taint checking if I kill it then ?)
     if ($name =~ /(.*)/) { $name    = $1; }
@@ -98,23 +97,13 @@
         return $t->output;
     }
 
+    my $any_result = 0;
     if ($what eq "module" or $what eq "pauseid") {
         $any_result = $self->_search_modules($t, $name, $what);
     } elsif ($what eq "user") {
         $any_result = $self->_search_users($t, $name, $what);
     } else {
-        my %where;
-        if ($what eq "subject") { %where = (subject => {'LIKE', '%' . $name . '%'}); }
-        if ($what eq "text")    { %where = (text    => {'LIKE', '%' . $name . '%'}); }
-        $self->log->debug("Search 1: " . join "|", %where);
-        if (%where) {
-
-            $self->log->debug("Search 2: " . join "|", %where);
-
-            my $page = $q->param('page') || 1;
-            $any_result = $self->_search_results($t, {where => \%where, page => $page});
-            $t->param($what => 1);
-        }
+        $any_result = $self->_search_posts($t, $name, $what);
     }
     $t->param(no_results => not $any_result);
     $t->output;
@@ -157,5 +146,25 @@
     return @things ? 1 : 0;
 }
 
+sub _search_posts {
+    my ($self, $t, $name, $what) = @_;
+
+    my $q = $self->query;
+
+    my %where;
+    if ($what eq "subject") { %where = (subject => {'LIKE', '%' . $name . '%'}); }
+    if ($what eq "text")    { %where = (text    => {'LIKE', '%' . $name . '%'}); }
+    $self->log->debug("Search 1: " . join "|", %where);
+    if (%where) {
+
+        $self->log->debug("Search 2: " . join "|", %where);
+
+        my $page = $q->param('page') || 1;
+        $t->param($what => 1);
+        return $self->_search_results($t, {where => \%where, page => $page});
+    }
+    return 0;
+}
+
 1;