Changeset 1420

Timestamp:

02/28/08 11:45:17 (5 months ago)

Author:

fumiakiy

Message:

Initial attempt to pluggable, extensible and hopefully faster search framework. BugId:69030, BugId:69029, BugId:69031

mt-search.cgi still defaults to legacy search application for now.

Files:

• branches/release-30/lib/MT/App/Search (added)
• branches/release-30/lib/MT/App/Search.pm (modified) (6 diffs)
• branches/release-30/lib/MT/App/Search/Legacy.pm (added)
• branches/release-30/lib/MT/Core.pm (modified) (1 diff)
• branches/release-30/lib/MT/Template/Context (added)
• branches/release-30/lib/MT/Template/Context/Search.pm (added)
• branches/release-30/mt-search.cgi (modified) (1 diff)

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

@@ -5 +5 @@
-# $Id$
-
-# Original Copyright 2001-2002 Jay Allen.
-# Modifications and integration Copyright 2001-2008 Six Apart.
-
-package MT::App::Search;
-
@@ -16 +13 @@
-use MT::Util qw(encode_html ts2epoch epoch2ts);
-use HTTP::Date qw(str2time time2str);
-
-
+
+
+
-
-sub init {
@@ -23 +21 @@
-    $app->SUPER::init(@_) or return;
-    $app->set_no_cache;
-    $app->add_methods( search => \&execute );
-    $app->{default_mode} = 'search';
-    $app;
-}
-
-load_core_tag
-require MT::Template::Contex
+core_method
+my $app = shif
-    return {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    };
-}
-
+sub core_query_params {
+    my $app = shift;
+    return [
+        'searchTerms',
+        'search',
+        'count',
+        'limit',
+        'startIndex',
+        'offset',
+    ];
+}
+
-sub init_request{
-    my $app = shift;
-    $app->SUPER::init_request(@_);
-
-
-
+
+
+
+
-        delete $app->{$_} if exists $app->{$_}
-    }
+
+    my %no_override;# = map { $_ => 1 } split /\s*,\s*/, $app->config->NoOverride;
+    my $blog_list = $app->create_blog_list( %no_override );
+    $app->{searchparam}{IncludeBlogs} = $blog_list->{IncludeBlogs}
+        if $blog_list && %$blog_list
+        && $blog_list->{IncludeBlogs}
+        && %{ $blog_list->{IncludeBlogs} };
+
+    ## Set other search params--prefer per-query setting, default to
+    ## config file.
+    for my $key (qw( ResultDisplay MaxResults SearchSortBy )) {
+        $app->{searchparam}{$key} = $no_override{$key} ?
+            $app->config->$key() : ($q->param($key) || $app->config->$key());
+    }
+}
+
+sub create_blog_list {
+    my $app = shift;
+    my ( %no_override ) = @_;
-
-    my $q = $app->param;
-    my $cfg = $app->config;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    ## Combine user-selected included/excluded blogs
-    ## with config file settings.
-    for my $type (qw( IncludeBlogs ExcludeBlogs )) {
-app->{searchparam}{$type} = { 
+blog_list{$type} = {
-        if (my $list = $cfg->$type()) {
-app->{searchparam}
+blog_list
-                { map { $_ => 1 } split /\s*,\s*/, $list };
-        }
-
+exists($no_override{$type}) && 
-        for my $blog_id ($q->param($type)) {
-            if ($blog_id =~ m/,/) {
@@ -99 +96 @@
-                foreach my $id (@ids) {
-                    next unless $id;
-app->{searchparam}
+blog_list
-                }
-            } else {
-                $blog_id =~ s/\D+//g; # only numeric values.
-app->{searchparam}
+blog_list
-            }
-        }
@@ -111 +108 @@
-    ## the blogs to search. If ExcludeBlogs was set, exclude any blogs
-    ## set in that list from our final list.
-
-
-
-
+
+
+
-        while (my $blog = $iter->()) {
-app->{searchparam}
+blog_list
-                unless $exclude && $exclude->{$blog->id};
-        }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    ## Initialize and set up the context object.
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $ctx->stash('search_string', encode_html($str));
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    $tmpl;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-sub query_parse {
@@ -811 +416 @@
-}
-
-
-sub _search_hit {
-    my($app, $entry) = @_;
-    my @text_elements;
-    if ($app->{searchparam}{SearchElement} ne 'comments') {
-        @text_elements = ($entry->title, $entry->text, $entry->text_more,
-                          $entry->keywords);
-    }
-    if ($app->{searchparam}{SearchElement} ne 'entries') {
-        my $comments = $entry->comments;
-        for my $comment (@$comments) {
-            push @text_elements, $comment->text, $comment->author,
-                                 $comment->url;
-        }
-    }
-    return 1 if $app->is_a_match(join("\n", map $_ || '', @text_elements));
-}
-
-sub _store_hit_data {
-    my $app = shift;
-    my($blog, $entry, $banner_seen) = @_;
-    my %result_data = (blog => $blog);
-    ## Need to create entry excerpt here, because we can't rely on
-    ## the user's per-blog setting.
-    unless ($entry->excerpt) {
-        $entry->excerpt($entry->get_excerpt($app->{searchparam}{ExcerptWords}));
-    }
-    $result_data{entry} = $entry;
-    if ($app->{searchparam}{Type} eq 'newcomments') {
-        push @{ $app->{results} }, \%result_data;
-    } else {
-        push(@{ $app->{results}{ $blog->name } }, \%result_data);
-    }
-}
-
-
-package MT::App::Search::Context;
-
-use strict;
-use base qw( MT::Template::Context );
-
-sub _hdlr_include_blogs { $_[0]->stash('include_blogs') || '' }
-sub _hdlr_search_string { $_[0]->stash('search_string') || '' }
-sub _hdlr_template_id { $_[0]->stash('template_id') || '' }
-sub _hdlr_max_results { $_[0]->stash('maxresults') || '' }
-
-sub _hdlr_result_count {
-    my $results = $_[0]->stash('results');
-    $results && ref($results) eq 'ARRAY' ? scalar @$results : 0;
-}
-
-sub _hdlr_results {
-    my($ctx, $args, $cond) = @_;
-
-    ## If there are no results, return the empty string, knowing
-    ## that the handler for <MTNoSearchResults> will fill in the
-    ## no results message.
-    my $results = $ctx->stash('results') or return '';
-
-    my $output = '';
-    my $build = $ctx->stash('builder');
-    my $tokens = $ctx->stash('tokens');
-    for my $res (@$results) {
-        $ctx->stash('entry', $res->{entry});
-        local $ctx->{__stash}{blog} = $res->{blog};
-        $ctx->stash('result', $res);
-        local $ctx->{current_timestamp} = $res->{entry}->created_on;
-        defined(my $out = $build->build($ctx, $tokens,
-            { %$cond, 
-                BlogResultHeader => $res->{blogheader} ? 1 : 0, 
-                BlogResultFooter => $res->{blogfooter} ? 1 : 0,
-                IfMaxResultsCutoff => $res->{maxresults} ? 1 : 0,
-            }
-            )) or return $ctx->error( $build->errstr );
-        $output .= $out;