Changeset 1855 for branches/release-34/lib/MT/App/Search.pm

Timestamp:

04/11/08 04:20:13 (19 months ago)

Author:

fumiakiy

Message:

Stopped sorting search results by blog id in multi blog search thus mix search results from multiple blogs. BugId:75781

Added SearchResultsHeader and SearchResultsFooter template tags.

Gave up on resurrecting per blog limiting of number of results.

Files:

• branches/release-34/lib/MT/App/Search.pm (modified) (3 diffs)

branches/release-34/lib/MT/App/Search.pm

@@ -267 +267 @@
             if $format !~ /\w+/;
     }
-    my $method = "render$format";
-    $method = 'render' unless $app->can($method);
+    my $method = "render";
+    $method .= $format if $format && $app->can($method . $format);
     $out = $app->$method( $count, $iter );
 
@@ -367 +367 @@
     push @terms, $parsed->{terms} if exists $parsed->{terms};
 
+    my $desc = 'descend' eq $app->{searchparam}{SearchResultDisplay} ? 'DESC' : 'ASC';
+    my @sort;
     my $sort = $params->{'sort'};
     if ( $sort !~ /\w+\!$/ && $app->{searchparam}{SearchSortBy} ) {
         my $sort_by = $app->{searchparam}{SearchSortBy};
-        $sort_by =~ s/[\w\-\.]+//g;
-        $sort = $sort_by;
-    }
+        $sort_by =~ s/[^\w\-\.\,]+//g;
+        if ( $sort_by ) {
+            my @sort_bys = split ',', $sort_by;
+            foreach my $key ( @sort_bys ) {
+                push @sort, {
+                    desc   => $desc,
+                    column => $key
+                };
+            }
+        }
+    }
+    push @sort, {
+        desc   => $desc,
+        column => $sort
+    };
 
     my %args = (
@@ -378 +392 @@
       $limit  ? ( 'limit' => $limit ) : (),
       $offset ? ( 'offset' => $offset ) : (),
-      $sort   ? ( 'sort' => [
-            { desc   => 'descend' eq $app->{searchparam}{SearchResultDisplay} ? 'DESC' : 'ASC',
-              column => $sort }
-        ] ) : (),
+      @sort   ? ( 'sort' => \@sort ) : (),
     );
-
-    if ( exists $app->{searchparam}{IncludeBlogs} ) {
-        unshift @{ $args{'sort'} },
-          { desc => 'ASC',
-            column    => 'blog_id' };
-    }
 
     ( \@terms, \%args );