Index: branches/release-30/lib/MT/Core.pm =================================================================== --- branches/release-30/lib/MT/Core.pm (revision 1400) +++ branches/release-30/lib/MT/Core.pm (revision 1420) @@ -515,6 +515,16 @@ 'comments' => { handler => 'MT::App::Comments', }, 'search' => { + handler => 'MT::App::Search::Legacy', + tags => sub { MT->app->load_core_tags }, + }, + 'new_search' => { handler => 'MT::App::Search', - tags => sub { MT->app->load_core_tags }, + tags => sub { + require MT::Template::Context::Search; + return MT::Template::Context::Search->load_core_tags(); + }, + methods => sub { MT->app->core_methods() }, + params => sub { MT->app->core_query_params() }, + author => { columns => [ qw( name nickname url email ) ] }, }, 'cms' => { Index: branches/release-30/lib/MT/Template/Context/Search.pm =================================================================== --- branches/release-30/lib/MT/Template/Context/Search.pm (revision 1420) +++ branches/release-30/lib/MT/Template/Context/Search.pm (revision 1420) @@ -0,0 +1,132 @@ +# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd. +# This program is distributed under the terms of the +# GNU General Public License, version 2. +# +# $Id$ + +package MT::Template::Context::Search; + +use strict; +use base qw( MT::Template::Context ); + +sub load_core_tags { + require MT::Template::Context; + return { + function => { + SearchString => \&_hdlr_search_string, + SearchResultCount => \&_hdlr_result_count, + MaxResults => \&_hdlr_max_results, + SearchIncludeBlogs => \&_hdlr_include_blogs, + SearchTemplateID => \&_hdlr_template_id, + }, + block => { + SearchResults => \&_hdlr_results, + 'IfTagSearch?' => sub { MT->instance->mode eq 'tag' }, + 'IfStraightSearch?' => sub { MT->instance->mode eq 'search' }, + 'NoSearchResults?' => sub { $_[0]->stash('count') ? 0 : 1; }, + 'NoSearch?' => sub { ( $_[0]->stash('search_string') && + $_[0]->stash('search_string') =~ /\S/ ) ? 0 : 1 }, + BlogResultHeader => \&MT::Template::Context::_hdlr_pass_tokens, + BlogResultFooter => \&MT::Template::Context::_hdlr_pass_tokens, + IfMaxResultsCutoff => \&MT::Template::Context::_hdlr_pass_tokens, + }, + }; +} + +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 will fill in the + ## no results message. + my $iter = $ctx->stash('results') or return ''; + my $count = $ctx->stash('count') or return ''; + my $max = $ctx->stash('maxresults'); + my $stash_key = $ctx->stash('stash_key') || 'entry'; + + my $output = ''; + my $build = $ctx->stash('builder'); + my $tokens = $ctx->stash('tokens'); + my $blog_header = 1; + my $blog_footer = 0; + my $count_per_blog = 0; + my $max_reached = 0; + my ( $this_object, $next_object ); + $this_object = $iter->(); + for ( my $i = 0; $i < $count; $i++) { + $count_per_blog++; + $ctx->stash($stash_key, $this_object); + if ( $this_object->can('blog') ) { + local $ctx->{__stash}{blog} = $this_object->blog; + } + if ( $this_object->isa('MT::Entry') ) { + local $ctx->{current_timestamp} = $this_object->authored_on; + } + elsif ( $this_object->properties->{audit} ) { + local $ctx->{current_timestamp} = $this_object->created_on; + } + + # TODO: per blog max objects? + #if ( $count_per_blog >= $max ) { + # while (1) { + # if ( $count > $i + 1 ) { + # $next_object = $results->[$i + 1]; + # if ( $next_object->blog_id ne $this_object->blog_id ) { + # $blog_footer = 1; + # last; + # } + # else { + # $max_reached = 1; + # } + # } + # else { + # $next_object = undef; + # $blog_footer = 1; + # last; + # } + # $i++; + # } + #} + #elsif ( $count > $i + 1 ) { + # $next_object = $results->[$i + 1]; + # $blog_footer = $next_object->blog_id ne $this_object->blog_id ? 1 : 0; + #} + #else { + # $blog_footer = 1; + #} + if ( $next_object = $iter->() ) { + $blog_footer = $next_object->blog_id ne $this_object->blog_id ? 1 : 0; + } + else { + $blog_footer = 1; + } + + defined(my $out = $build->build($ctx, $tokens, + { %$cond, + BlogResultHeader => $blog_header, + BlogResultFooter => $blog_footer, + IfMaxResultsCutoff => $max_reached, + } + )) or return $ctx->error( $build->errstr ); + $output .= $out; + + $this_object = $next_object; + last unless $this_object; + $blog_header = $blog_footer ? 1 : 0; + } + $output; +} + +1; +__END__ + Index: branches/release-30/lib/MT/App/Search.pm =================================================================== --- branches/release-30/lib/MT/App/Search.pm (revision 1308) +++ branches/release-30/lib/MT/App/Search.pm (revision 1420) @@ -5,7 +5,4 @@ # $Id$ -# Original Copyright 2001-2002 Jay Allen. -# Modifications and integration Copyright 2001-2008 Six Apart. - package MT::App::Search; @@ -16,6 +13,7 @@ use MT::Util qw(encode_html ts2epoch epoch2ts); use HTTP::Date qw(str2time time2str); - -sub id { 'search' } +use MT::Entry qw( :constants ); + +sub id { 'new_search' } sub init { @@ -23,74 +21,73 @@ $app->SUPER::init(@_) or return; $app->set_no_cache; - $app->add_methods( search => \&execute ); $app->{default_mode} = 'search'; $app; } -sub load_core_tags { - require MT::Template::Context; +sub core_methods { + my $app = shift; return { - function => { - SearchString => \&MT::App::Search::Context::_hdlr_search_string, - SearchResultCount => \&MT::App::Search::Context::_hdlr_result_count, - MaxResults => \&MT::App::Search::Context::_hdlr_max_results, - SearchIncludeBlogs => \&MT::App::Search::Context::_hdlr_include_blogs, - SearchTemplateID => \&MT::App::Search::Context::_hdlr_template_id, - }, - block => { - SearchResults => \&MT::App::Search::Context::_hdlr_results, - - 'IfTagSearch?' => sub { MT->instance->{searchparam}{Type} eq 'tag' }, - 'IfStraightSearch?' => sub { MT->instance->{searchparam}{Type} eq 'straight' }, - NoSearchResults => \&MT::Template::Context::_hdlr_pass_tokens, - NoSearch => \&MT::Template::Context::_hdlr_pass_tokens, - BlogResultHeader => \&MT::Template::Context::_hdlr_pass_tokens, - BlogResultFooter => \&MT::Template::Context::_hdlr_pass_tokens, - IfMaxResultsCutoff => \&MT::Template::Context::_hdlr_pass_tokens, - }, + 'search' => \&process, + 'author' => \&process, }; } +sub core_query_params { + my $app = shift; + return [ + 'searchTerms', + 'search', + 'count', + 'limit', + 'startIndex', + 'offset', + ]; +} + sub init_request{ my $app = shift; $app->SUPER::init_request(@_); - - foreach (qw(searchparam templates search_string results - user __have_throttle)) { + my $q = $app->param; + + my $params = $app->registry('params'); + foreach ( @$params ) { 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; - my $tag = $q->param('tag') || ''; - $app->param('Type', 'tag') if $tag; - $app->param('search', $tag) if $tag; - my $blog_id = $q->param('blog_id') || ''; - my $include_blog_id = $q->param('IncludeBlogs') || ''; - - unless ($include_blog_id){ - $app->param('IncludeBlogs', $blog_id) if $blog_id; - } - - ## Get login information if user is logged in (via cookie). - ## If no login cookie, this fails silently, and that's fine. - ($app->{user}) = $app->login; - - ## Check whether IP address has searched in the last - ## minute which is still progressing. If so, block it. - return $app->throttle_response() unless $app->throttle_control(); - - my %no_override = map { $_ => 1 } split /\s*,\s*/, $cfg->NoOverride; - + #%no_override = map { $_ => 1 } split /\s*,\s*/, $cfg->NoOverride + # unless %no_override; + + my %blog_list; ## 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}{$type} = + $blog_list{$type} = { map { $_ => 1 } split /\s*,\s*/, $list }; } - next if $no_override{$type}; + next if exists($no_override{$type}) && $no_override{$type}; for my $blog_id ($q->param($type)) { if ($blog_id =~ m/,/) { @@ -99,9 +96,9 @@ foreach my $id (@ids) { next unless $id; - $app->{searchparam}{$type}{$id} = 1; + $blog_list{$type}{$id} = 1; } } else { $blog_id =~ s/\D+//g; # only numeric values. - $app->{searchparam}{$type}{$blog_id} = 1; + $blog_list{$type}{$blog_id} = 1; } } @@ -111,615 +108,223 @@ ## the blogs to search. If ExcludeBlogs was set, exclude any blogs ## set in that list from our final list. - if (!keys %{ $app->{searchparam}{IncludeBlogs} }) { - my $exclude = $app->{searchparam}{ExcludeBlogs}; - require MT::Blog; - my $iter = MT::Blog->load_iter; + unless ( exists $blog_list{IncludeBlogs} ) { + my $exclude = $blog_list{ExcludeBlogs}; + my $iter = $app->model('blog')->load_iter; while (my $blog = $iter->()) { - $app->{searchparam}{IncludeBlogs}{$blog->id} = 1 + $blog_list{IncludeBlogs}{$blog->id} = 1 unless $exclude && $exclude->{$blog->id}; } } - ## Set other search params--prefer per-query setting, default to - ## config file. - for my $key (qw( RegexSearch CaseSearch ResultDisplay SearchCutoff - CommentSearchCutoff ExcerptWords SearchElement - Type MaxResults SearchSortBy )) { - $app->{searchparam}{$key} = $no_override{$key} ? - $cfg->$key() : ($q->param($key) || $cfg->$key()); - } - $app->{searchparam}{entry_type} = $q->param('type'); - $app->{searchparam}{Template} = $q->param('Template') || - ($app->{searchparam}{Type} eq 'newcomments' ? 'comments' : 'default'); - - ## Define alternate user templates from config file - if (my @tmpls = ($cfg->default('AltTemplate'), $cfg->AltTemplate)) { - for my $tmpl (@tmpls) { - next unless defined $tmpl; - my($nickname, $file) = split /\s+/, $tmpl; - $app->{templates}{$nickname} = $file; - } - } - - $app->{templates}{default} = $cfg->DefaultTemplate; - $app->{searchparam}{SearchTemplatePath} = $cfg->SearchTemplatePath; - - ## Set search_string (for display only) - if ( ( $app->{searchparam}{Type} eq 'straight' ) - || ( $app->{searchparam}{Type} eq 'tag' ) ) { - if ($q->param('search')) { - $app->{search_string} = $q->param('search'); - $app->{search_string_decoded} = MT::I18N::decode( - $app->config->PublishCharset, - $app->{search_string} - ); - } else { - $app->{search_string} = $app->{search_string_decoded} = q(); - } - } -} - -sub throttle_response { - my $app = shift; - my $tmpl = $app->param('Template') || ''; - my $msg = $app->translate( - "You are currently performing a search. Please wait " . - "until your search is completed."); - if ($tmpl eq 'feed') { - $app->response_code(503); - $app->set_header('Retry-After' => $app->config('ThrottleSeconds')); - $app->send_http_header("text/plain"); - $app->{no_print_body} = 1; - } - return $app->error($msg); -} - -sub throttle_control { - my $app = shift; - - # Don't throttle MT registered users - return 1 if $app->{user} && $app->{user}->type == MT::Author::AUTHOR(); - - my $type = $app->param('Type') || ''; - - # Don't throttle tag listings - return 1 if $type eq 'tag'; - - my $ip = $app->remote_ip; - my $whitelist = $app->config('SearchThrottleIPWhitelist'); - if ($whitelist) { - # check for $ip in $whitelist - my @list = split /(\s*[,;]\s*|\s+)/, $whitelist; - foreach (@list) { - next unless $_ =~ m/^\d{1,3}(\.\d{0,3}){0,3}$/; - if (($ip eq $_) || ($ip =~ m/^\Q$_\E/)) { - return 1; - } - } - } - - if (eval { require DB_File; 1 }) { - my $file = File::Spec->catfile($app->config('TempDir'), 'mt-throttle.db'); - my $DB = tie my %db, 'DB_File', $file; - if ($DB) { - if (my $time = $db{$ip}) { - if ($time > time - $app->config('ThrottleSeconds')) { - return 0; + \%blog_list; +} + +sub process { + my $app = shift; + + my ( $terms, $args ) = $app->search_terms(); + return $app->error($app->errstr) if $app->errstr; + + my $count = 0; + my $iter; + if ( $terms && @$terms ) { + ( $count, $iter ) = $app->execute( $terms, $args ); + return $app->error($app->errstr) unless $iter; + + $iter = $app->post_search( $count, $iter ); + } + + return $app->render( $count, $iter ); +} + +sub count { + my $app = shift; + my ( $class, $terms, $args ) = @_; + #TODO: cache! + $class->count( $terms, $args ); +} + +sub execute { + my $app = shift; + my ( $terms, $args ) = @_; + + my $class = $app->model( $app->mode eq 'search' ? 'entry' : $app->mode ); + my $count = $app->count( $class, $terms, $args ); + #TODO: cache! + my $iter = $class->load_iter( $terms, $args ) + or $app->error($class->errstr); + ( $count, $iter ); +} + +sub search_terms { + my $app = shift; + my $q = $app->param; + + my $search_string = $q->param('searchTerms') || $q->param('search') + or return ( undef, undef ); + $app->{search_string} = $search_string; + my $offset = $q->param('startIndex') || $q->param('offset') || 0; + my $limit = $q->param('count') || $q->param('limit'); + my $max = $app->{searchparam}{MaxResults}; + $limit = $max if !$limit || ( $limit - $offset > $max ); + + my $type = $q->param('type'); + my $entry_type = $app->mode eq 'search' + ? 1 + : $type + ? ( 'entry' eq lc($type) || 'page' eq lc($type) + ? 1 + : 0 ) + : 0; + + my $def_terms = { + $entry_type ? ( status => MT::Entry::RELEASE() ) : (), + $type ? ( class => $type ) : (), + exists( $app->{searchparam}{IncludeBlogs} ) + ? ( blog_id => [ keys %{ $app->{searchparam}{IncludeBlogs} } ] ) + : (), + }; + my @terms; + push @terms, $def_terms if %$def_terms; + + my $columns = $app->mode eq 'search' + ? [ [ qw( title keywords text text_more ) ] ] + : $app->registry( $app->mode, 'columns' ); + $columns = $columns->[0]; # FIXME: Why? + return $app->errtrans('No columns to search for was specified for [_1]', $app->mode) + unless $columns && @$columns; + my $number = scalar @$columns; + my @and; + for ( my $i = 0; $i < $number; $i++) { + push @and, { $columns->[$i] => { like => '%'.$search_string.'%' } }; + unless ( $i == $number - 1 ) { + push @and, '-or'; + } + } + push @terms, '-and' if @terms; + push @terms, \@and; + + my %args = ( + $limit ? ( 'limit' => $limit ) : (), + $offset ? ( 'offset' => $offset ) : (), + 'sort' => [ + { desc => 'descend' eq $app->{searchparam}{ResultDisplay} ? 'DESC' : 'ASC', + column => $entry_type ? 'authored_on' : 'created_on' } + ] + ); + + if ( exists $app->{searchparam}{IncludeBlogs} ) { + unshift @{ $args{'sort'} }, + { desc => 'ASC', + column => 'blog_id' }; + } + + ( \@terms, \%args ); +} + +sub post_search { + my $app = shift; + my ( $count, $iter ) = @_; + # TODO: cache here? + $iter; +} + +sub template_paths { + my $app = shift; + my @paths = $app->SUPER::template_paths; + ( $app->config->SearchTemplatePath, @paths ); +} + +sub load_search_tmpl { + my $app = shift; + my $q = $app->param; + my ( $count, $iter ) = @_; + + my $blog_id; + if ( $q->param('IncludeBlogs') ) { + my @ids = split ',', $q->param('IncludeBlogs'); + $blog_id = $ids[0]; + } + elsif ( exists $app->{searchparam}{IncludeBlogs} ) { + $blog_id = @{ keys %{ $app->{searchparam}{IncludeBlogs} } }[0]; + } + + my $tmpl; + if ( $q->param('Template') && ( 'default' ne $q->param('Template') ) ) { + # load specified template + my $filename; + if (my @tmpls = ($app->config->default('AltTemplate'), $app->config->AltTemplate)) { + for my $tmpl (@tmpls) { + next unless defined $tmpl; + my ( $nickname, $file ) = split /\s+/, $tmpl; + if ( $nickname eq $q->param('Template') ) { + $filename = $file; + last; } } - $db{$ip} = time; - undef $DB; - untie %db; - $app->{__have_throttle} = 1; - } - } - - 1; -} - -sub takedown { - my $app = shift; - if ($app->{__have_throttle}) { - my $file = File::Spec->catfile($app->config('TempDir'), - 'mt-throttle.db'); - if (tie my %db, 'DB_File', $file) { - my $time = $db{$app->remote_ip}; - delete $db{$app->remote_ip} if ($time && $time < (time - $app->config('ThrottleSeconds'))); - untie %db; - } - } - $app->SUPER::takedown(@_); -} - -sub execute { - my $app = shift; - return $app->error($app->errstr) if $app->errstr; - - my @results; - if ($app->{searchparam}{RegexSearch}) { - eval { m/$app->{search_string}/ }; - return $app->error($app->translate("Search failed. Invalid pattern given: [_1]", $@)) - if $@; - } - if ($app->{searchparam}{Type} eq 'newcomments') { - $app->_new_comments - or return $app->error($app->translate( - "Search failed: [_1]", $app->errstr)); - @results = $app->{results} ? @{ $app->{results} } : (); - } elsif ($app->{searchparam}{Type} eq 'tag') { - $app->_tag_search - or return $app->error($app->translate( - "Search failed: [_1]", $app->errstr)); - my $col = $app->{searchparam}{SearchSortBy}; - my $order = $app->{searchparam}{ResultDisplay} || 'ascend'; - for my $blog (sort keys %{ $app->{results} }) { - my @res = @{ $app->{results}{$blog} }; - if ($col) { - @res = $order eq 'ascend' ? - sort { $a->{entry}->$col() cmp $b->{entry}->$col() } @res : - sort { $b->{entry}->$col() cmp $a->{entry}->$col() } @res; - } - $res[0]{blogheader} = 1; - my $max = $#res; - $res[$max]{blogfooter} = 1; - push @results, @res; - } - } else { - $app->_straight_search - or return $app->error($app->translate( - "Search failed: [_1]", $app->errstr)); - ## Results are stored per-blog, so we sort the list of blogs by name, - ## then add in the results to the final list. - my $col = $app->{searchparam}{SearchSortBy}; - my $order = $app->{searchparam}{ResultDisplay} || 'ascend'; - for my $blog (sort keys %{ $app->{results} }) { - my @res = @{ $app->{results}{$blog} }; - if ($col) { - @res = $order eq 'ascend' ? - sort { $a->{entry}->$col() cmp $b->{entry}->$col() } @res : - sort { $b->{entry}->$col() cmp $a->{entry}->$col() } @res; - } - $res[0]{blogheader} = 1; - my $max = $#res; - $res[$max]{blogfooter} = 1; - push @results, @res; - } - } - - ## We need to put a blog in context so that includes and <$MTBlog*$> - ## tags will work, if they are used. So we choose the first blog in - ## the result list. If there is no result list, just load the first - ## blog from the database. - my($blog); - my $include = $app->param('IncludeBlogs'); - if ($include) { - my @blog_ids = split ',', $include; - $blog = MT::Blog->load($blog_ids[0]); - } else { - if (@results) { - $blog = $results[0]{blog}; - } - if (!$blog) { - $blog = MT::Blog->load($app->param('blog_id')); - } - $include = $blog->id; - } + } + return $app->errtrans("No alternate template is specified for the Template '[_1]'", $q->param('Template')) + unless $filename; + # template_paths method does the magic + $tmpl = $app->load_tmpl( $filename ) + or return $app->errtrans( "Opening local file '[_1]' failed: [_2]", $filename, "$!" ); + } + else { + # load default template + # first look for appropriate blog_id + if ( $blog_id ) { + # look for 'search_results' + my $tmpl_class = $app->model('template'); + $tmpl = $tmpl_class->load( + { blog_id => $blog_id, type => 'search_results' } + ); + } + unless ( $tmpl ) { + # load template from search_template path + # template_paths method does the magic + $tmpl = $app->load_tmpl( $app->config->DefaultTemplate ); + } + } + return $app->error($app->errstr) + unless $tmpl; ## Initialize and set up the context object. - my $ctx = MT::App::Search::Context->new; - $ctx->stash('blog', $blog); - $ctx->stash('blog_id', $blog->id); - $ctx->stash('results', \@results); - $ctx->stash('user', $app->{user}); - $ctx->stash('include_blogs', $include); - if (my $str = $app->{search_string}) { + require MT::Template::Context::Search; + my $ctx = MT::Template::Context::Search->new; + if ( $blog_id ) { + $ctx->stash('blog_id', $blog_id); + $ctx->stash('blog', $app->model('blog')->load($blog_id)); + } + $ctx->stash('results', $iter); + $ctx->stash('count', $count); + $ctx->stash('stash_key', $app->mode) + if 'search' ne $app->mode; + $ctx->stash('include_blogs', + join ',', keys %{ $app->{searchparam}{IncludeBlogs} }); + if ( my $str = $app->{search_string} ) { $ctx->stash('search_string', encode_html($str)); } - $ctx->stash('template_id', $app->{searchparam}{Template}); - $ctx->stash('maxresults', $app->{searchparam}{MaxResults}); - $ctx->var( 'page_layout', $blog->page_layout ) - if $blog && $blog->page_layout; - if (my $layout = $ctx->var('page_layout')) { - my $columns = { - 'layout-wt' => 2, - 'layout-tw' => 2, - 'layout-wm' => 2, - 'layout-mw' => 2, - 'layout-wtt' => 3, - 'layout-twt' => 3, - }->{$layout}; - $ctx->var( 'page_columns', $columns ) if $columns; - } - - my $str; - if ($include) { - if ($app->{searchparam}{Template} eq 'default') { - # look for a 'search_results' - my ($blog_id) = split ',', $include; - require MT::Template; - my $tmpl = MT::Template->load({blog_id => $blog_id, type => 'search_results'}); - $str = $tmpl->text if $tmpl; - } - } - - if (!$str) { - ## Load the search template. - my $tmpl_file = $app->{templates}{ $app->{searchparam}{Template} } - or return $app->error($app->translate("No alternate template is specified for the Template '[_1]'", $app->{searchparam}{Template})); - my $tmpl = File::Spec->catfile($app->{searchparam}{SearchTemplatePath}, - $tmpl_file); - local *FH; - open FH, $tmpl - or return $app->error($app->translate( - "Opening local file '[_1]' failed: [_2]", $tmpl, "$!" )); - - { local $/; $str = }; - close FH; - } - $str = $app->translate_templatized($str); - - my $ifmax; - my $max; - if (($app->{searchparam}{MaxResults}) && ($app->{searchparam}{MaxResults} != 9999999)) { - $max = $app->{searchparam}{MaxResults}; - $ifmax = 1; - } else { - $ifmax = $max = 0; - } - - ## Compile and build the search template with results. - require MT::Builder; - my $build = MT::Builder->new; - my $tokens = $build->compile($ctx, $str) - or return $app->error($app->translate( - "Publishing results failed: [_1]", $build->errstr)); - defined(my $res = $build->build($ctx, $tokens, { - NoSearch => $app->{query}->param('help') || - ($app->{searchparam}{Type} ne 'newcomments' && - (!$ctx->stash('search_string') || - $ctx->stash('search_string') !~ /\S/)) ? 1 : 0, - NoSearchResults => $ctx->stash('search_string') && - $ctx->stash('search_string') =~ /\S/ && - !scalar @results, - SearchResults => scalar @results, - } )) - or return $app->error($app->translate( - "Publishing results failed: [_1]", $ctx->errstr)); - $res = $app->_set_form_elements($res); - - if (defined($ctx->stash('content_type'))) { - $app->{no_print_body} = 1; - if ($app->{searchparam}{Template} eq 'feed') { - my $last_update; - for (@results) { - my $authored_on = ts2epoch($_->{blog}, $_->{entry}->authored_on); - $last_update = $authored_on if $authored_on > $last_update; - } - my $mod_since = $app->get_header('If-Modified-Since'); - - if ( !@results || ($last_update && $mod_since && ($last_update <= str2time($mod_since))) ) { - $app->response_code(304); - $app->response_message('Not Modified'); - $app->send_http_header($ctx->stash('content_type')); - } else { - $app->set_header('Last-Modified', time2str($last_update)) if $last_update; - $app->send_http_header($ctx->stash('content_type')); - $app->print($res); - } - } else { - $app->send_http_header($ctx->stash('content_type')); - $app->print($res); - } - } - $res; -} - -sub _tag_search { - my $app = shift; - return 1 unless $app->{search_string} =~ /\S/; - - # since this technically isn't a search, but a dynamic view - # of data, suppress logging... - #require MT::Log; - #$app->log({ - # message => $app->translate("Search: query for '[_1]'", - # $app->{search_string}), - # level => MT::Log::INFO(), - # class => 'search', - # category => 'tag_search', - #}); - - require MT::Entry; - my %terms = (status => MT::Entry::RELEASE()); - my %args = (direction => $app->{searchparam}{ResultDisplay}, - 'sort' => 'authored_on'); - - require MT::Tag; - require MT::ObjectTag; - my $tags = $app->{search_string}; - my @tag_names = MT::Tag->split(',', $tags); - my %tags = map { $_ => 1, MT::Tag->normalize($_) => 1 } @tag_names; - my @tags = MT::Tag->load({ name => [ keys %tags ] }); - my @tag_ids; - foreach (@tags) { - push @tag_ids, $_->id; - my @more = MT::Tag->load({ n8d_id => $_->n8d_id ? $_->n8d_id : $_->id }); - push @tag_ids, $_->id foreach @more; - } - @tag_ids = ( 0 ) unless @tags; - $args{'join'} = ['MT::ObjectTag', 'object_id', - { tag_id => \@tag_ids, object_datasource => MT::Entry->datasource }, { unique => 1 } ]; - - ## Load available blogs and iterate through entries looking for search term - require MT::Util; - require MT::Blog; - require MT::Entry; - - # Override SearchCutoff if If-Modified-Since header is present - if ((my $mod_since = $app->get_header('If-Modified-Since')) && $app->{searchparam}{Template} eq 'feed') { - my $tz_offset = 15; # Start with maximum possible offset to UTC - my $blog_selected; - my $iter; - if ($app->{searchparam}{IncludeBlogs}) { - $iter = MT::Blog->load_iter({ id => [ keys %{ $app->{searchparam}{IncludeBlogs} }] }); - } else { - $iter = MT::Blog->load_iter; - } - while (my $blog = $iter->()) { - my $blog_offset = $blog->server_offset ? - $blog->server_offset : 0; - if ($blog_offset < $tz_offset) { - $tz_offset = $blog_offset; - $blog_selected = $blog; - } - } - $mod_since = epoch2ts($blog_selected, str2time($mod_since)); - $terms{authored_on} = [ $mod_since ]; - $args{range} = { authored_on => 1 }; - } else { - if ($app->{searchparam}{SearchCutoff} && - $app->{searchparam}{SearchCutoff} != 9999999) { - my @ago = MT::Util::offset_time_list(time - 3600 * 24 * - $app->{searchparam}{SearchCutoff}); - my $ago = sprintf "%04d%02d%02d%02d%02d%02d", - $ago[5]+1900, $ago[4]+1, @ago[3,2,1,0]; - $terms{authored_on} = [ $ago ]; - $args{range} = { authored_on => 1 }; - } - } - - if (keys %{ $app->{searchparam}{IncludeBlogs} }) { - $terms{blog_id} = [ keys %{ $app->{searchparam}{IncludeBlogs} } ]; - } - $terms{class} = $app->{searchparam}{entry_type} || '*'; - my $iter = MT::Entry->load_iter(\%terms, \%args); - my(%blogs, %hits); - my $max = $app->{searchparam}{MaxResults}; - while (my $entry = $iter->()) { - my $blog_id = $entry->blog_id; - if ($hits{$blog_id} && $hits{$blog_id} >= $max) { - my $blog = $blogs{$blog_id} || MT::Blog->load($blog_id); - my @res = @{ $app->{results}{$blog->name} }; - my $count = $#res; - $res[$count]{maxresults} = $max; - next; - } - if ($app->_search_hit($entry)) { - my $blog = $blogs{$blog_id} || MT::Blog->load($blog_id); - $app->_store_hit_data($blog, $entry, $hits{$blog_id}++); - } - } - 1; -} - -sub _straight_search { - my $app = shift; - return 1 unless $app->{search_string} =~ /\S/; - - ## Parse, tokenize and optimize the search query. - $app->query_parse; - - ## Load available blogs and iterate through entries looking for search term - require MT::Util; - require MT::Blog; - require MT::Entry; - - my %terms = (status => MT::Entry::RELEASE()); - my %args = (direction => $app->{searchparam}{ResultDisplay}, - 'sort' => 'authored_on'); - - # Override SearchCutoff if If-Modified-Since header is present - if ((my $mod_since = $app->get_header('If-Modified-Since')) && $app->{searchparam}{Template} eq 'feed') { - my $tz_offset = 15; # Start with maximum possible offset to UTC - my $blog_selected; - my $iter; - if ($app->{searchparam}{IncludeBlogs}) { - $iter = MT::Blog->load_iter({ id => [ keys %{ $app->{searchparam}{IncludeBlogs} }] }); - } else { - $iter = MT::Blog->load_iter; - } - while (my $blog = $iter->()) { - my $blog_offset = $blog->server_offset ? - $blog->server_offset : 0; - if ($blog_offset < $tz_offset) { - $tz_offset = $blog_offset; - $blog_selected = $blog; - } - } - $mod_since = epoch2ts($blog_selected, str2time($mod_since)); - $terms{authored_on} = [ $mod_since ]; - $args{range} = { authored_on => 1 }; - } else { - if ($app->{searchparam}{SearchCutoff} && - $app->{searchparam}{SearchCutoff} != 9999999) { - my @ago = MT::Util::offset_time_list(time - 3600 * 24 * - $app->{searchparam}{SearchCutoff}); - my $ago = sprintf "%04d%02d%02d%02d%02d%02d", - $ago[5]+1900, $ago[4]+1, @ago[3,2,1,0]; - $terms{authored_on} = [ $ago ]; - $args{range} = { authored_on => 1 }; - } - } - - if (keys %{ $app->{searchparam}{IncludeBlogs} }) { - $terms{blog_id} = [ keys %{ $app->{searchparam}{IncludeBlogs} } ]; - } - - my $blog_id; - if ($terms{blog_id} && (scalar(@{ $terms{blog_id} }) == 1)) { - $blog_id = $terms{blog_id}[0]; - } - - #FIXME: template name may not be 'feed' for search feed - unless ($app->{searchparam}{Template} eq 'feed') { - require MT::Log; - $app->log({ - message => $app->translate("Search: query for '[_1]'", - $app->{search_string}), - level => MT::Log::INFO(), - class => 'search', - category => 'straight_search', - $blog_id ? (blog_id => $blog_id) : () - }); - } - - $terms{class} = $app->{searchparam}{entry_type} || '*'; - - my $iter = MT::Entry->load_iter(\%terms, \%args); - my(%blogs, %hits); - my $max = $app->{searchparam}{MaxResults}; - while (my $entry = $iter->()) { - my $blog_id = $entry->blog_id; - if ($hits{$blog_id} && $hits{$blog_id} >= $max) { - my $blog = $blogs{$blog_id} || MT::Blog->load($blog_id); - my @res = @{ $app->{results}{$blog->name} }; - my $count = $#res; - $res[$count]{maxresults} = $max; - next; - } - if ($app->_search_hit($entry)) { - my $blog = $blogs{$blog_id} || MT::Blog->load($blog_id); - $app->_store_hit_data($blog, $entry, $hits{$blog_id}++); - } - } - 1; -} - -sub _new_comments { - my $app = shift; - return 1 if $app->param('help'); - - require MT::Log; - $app->log({ - message => $app->translate("Search: new comment search"), - level => MT::Log::INFO(), - class => 'search', - category => 'comment_search' - }); - require MT::Entry; - require MT::Blog; - require MT::Util; - my %args = ('join' => [ - 'MT::Comment', 'entry_id', { visible => 1 }, - { 'sort' => 'created_on', - direction => 'descend', - unique => 1, } - ]); - if ($app->{searchparam}{CommentSearchCutoff} && - $app->{searchparam}{CommentSearchCutoff} != 9999999) { - my @ago = MT::Util::offset_time_list(time - 3600 * 24 * - $app->{searchparam}{CommentSearchCutoff}); - my $ago = sprintf "%04d%02d%02d%02d%02d%02d", - $ago[5]+1900, $ago[4]+1, @ago[3,2,1,0]; - $args{'join'}->[2]{created_on} = [ $ago ]; - $args{'join'}->[3]{range} = { created_on => 1 }; - } elsif ($app->{searchparam}{MaxResults} && - $app->{searchparam}{MaxResults} != 9999999) { - $args{limit} = $app->{searchparam}{MaxResults}; - } - my %terms = { status => MT::Entry::RELEASE() }; - $terms{class} = $app->{searchparam}{entry_type} || '*'; - my $iter = MT::Entry->load_iter(\%terms, \%args); - my %blogs; - my $include = $app->{searchparam}{IncludeBlogs}; - while (my $entry = $iter->()) { - next unless $include->{ $entry->blog_id }; - my $blog = $blogs{ $entry->blog_id } || MT::Blog->load($entry->blog_id); - $app->_store_hit_data($blog, $entry); - } - 1; -} - -sub _set_form_elements { - my($app, $tmpl) = @_; - ## Fill in user-defined template with proper form settings. - if ($app->{searchparam}{Type} eq 'newcomments') { - if ($app->{searchparam}{CommentSearchCutoff}) { - $tmpl =~ s/(.*