Changeset 471

Timestamp:

07/22/08 13:31:57 (4 months ago)

Author:

ogawa

Message:

Support blog_ids, include_blogs, and exclude_blogs options.
Expand tabs to whitespaces.
Update version number.

Files:

• TagSupplementals/trunk/TagSupplementals.pl (modified) (18 diffs)

TagSupplementals/trunk/TagSupplementals.pl

@@ -23 +23 @@
 
 BEGIN {
-    our $VERSION = '0.06';
+    our $VERSION = '0.10';
 
     eval { require MT::XSearch; $HAVE_MT_XSEARCH = 1 };
     if ($HAVE_MT_XSEARCH) {
-        MT::XSearch->add_search_plugin('TagSupplementals', {
-            label => 'Tag Search',
-            description => 'Tag Search plugin for MT-XSearch',
-            on_execute => \&xsearch_on_execute,
-            on_stash => \&xsearch_on_stash,
-        });
+        MT::XSearch->add_search_plugin('TagSupplementals', {
+            label => 'Tag Search',
+            description => 'Tag Search plugin for MT-XSearch',
+            on_execute => \&xsearch_on_execute,
+            on_stash => \&xsearch_on_stash,
+        });
     }
 
     my $plugin = __PACKAGE__->new({
-        name => 'TagSupplementals Plugin',
-        description => 'A plugin for providing supplemental "tag" features for MT 3.3+',
-        doc_link => 'http://code.as-is.net/wiki/TagSupplementals_Plugin',
-        author_name => 'Hirotaka Ogawa',
-        author_link => 'http://profile.typekey.com/ogawa/',
-        version => $VERSION,
-        registry => {
-            tags => {
-                block => {
-                    RelatedEntries => \&related_entries,
-                    RelatedTags => \&related_tags,
-                    ArchiveTags => \&archive_tags,
-                    SearchTags => \&search_tags,
-                    $HAVE_MT_XSEARCH ? (XSearchTags => \&xsearch_tags) : (),
-                },
-                function => {
-                    EntryTagsCount => \&entry_tags_count,
-                    TagLastUpdated => \&tag_last_updated,
-                    $HAVE_MT_XSEARCH ? (TagXSearchLink => \&tag_xsearch_link) : (),
-                },
-                modifier => {
-                    encode_urlplus => \&encode_urlplus,
-                },
-            },
-        },
-        template_tags => {
-            EntryTagsCount => \&entry_tags_count,
-            TagLastUpdated => \&tag_last_updated,
-            $HAVE_MT_XSEARCH ? (TagXSearchLink => \&tag_xsearch_link) : (),
-        },
-        container_tags => {
-            RelatedEntries => \&related_entries,
-            RelatedTags => \&related_tags,
-            ArchiveTags => \&archive_tags,
-            SearchTags => \&search_tags,
-            $HAVE_MT_XSEARCH ? (XSearchTags => \&xsearch_tags) : (),
-        },
-        global_filters => {
-            encode_urlplus => \&encode_urlplus,
-        },
+        name           => 'TagSupplementals',
+        description    => 'A plugin for providing supplemental "tag" features for MT 3.3+',
+        doc_link       => 'http://code.as-is.net/public/wiki/TagSupplementals_Plugin',
+        author_name    => 'Hirotaka Ogawa',
+        author_link    => 'http://profile.typekey.com/ogawa/',
+        version        => $VERSION,
+        registry       => {
+            tags => {
+                block    => {
+                    RelatedEntries => \&related_entries,
+                    RelatedTags    => \&related_tags,
+                    ArchiveTags    => \&archive_tags,
+                    SearchTags     => \&search_tags,
+                    $HAVE_MT_XSEARCH ? (XSearchTags => \&xsearch_tags) : (),
+                },
+                function => {
+                    EntryTagsCount => \&entry_tags_count,
+                    TagLastUpdated => \&tag_last_updated,
+                    $HAVE_MT_XSEARCH ? (TagXSearchLink => \&tag_xsearch_link) : (),
+                },
+                modifier => {
+                    encode_urlplus => \&encode_urlplus,
+                },
+            },
+        },
+        template_tags  => {
+            EntryTagsCount => \&entry_tags_count,
+            TagLastUpdated => \&tag_last_updated,
+            $HAVE_MT_XSEARCH ? (TagXSearchLink => \&tag_xsearch_link) : (),
+        },
+        container_tags => {
+            RelatedEntries => \&related_entries,
+            RelatedTags    => \&related_tags,
+            ArchiveTags    => \&archive_tags,
+            SearchTags     => \&search_tags,
+            $HAVE_MT_XSEARCH ? (XSearchTags => \&xsearch_tags) : (),
+        },
+        global_filters => {
+            encode_urlplus => \&encode_urlplus,
+        },
     });
     MT->add_plugin($plugin);
@@ -83 +83 @@
     my $ctx = shift;
     my $entry = $ctx->stash('entry')
-        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
+        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
     my @tags = $entry->get_tags;
     scalar @tags;
@@ -91 +91 @@
     my ($ctx, $args) = @_;
     my $tag = $ctx->stash('Tag') or return '';
-    my $blog_id = $ctx->stash('blog_id') or return '';
+    my (%blog_terms, %blog_args);
+    $ctx->set_blog_load_context($args, \%blog_terms, \%blog_args)
+        or return $ctx->error($ctx->errstr);
 
     my ($e) = MT::Entry->load(undef, {
-        sort => 'created_on',
-        direction => 'descend',
-        limit => 1,
-        join => [ 'MT::ObjectTag', 'object_id', {
-            tag_id => $tag->id,
-            blog_id => $blog_id,
-            object_datasource => MT::Entry->datasource,
-        }, {
-            unique => 1,
-        } ] })
-        or return '';
+        sort      => 'created_on',
+        direction => 'descend',
+        limit     => 1,
+        join      => [ 'MT::ObjectTag', 'object_id', {
+            %blog_terms,
+            tag_id            => $tag->id,
+            object_datasource => MT::Entry->datasource,
+        }, {
+            %blog_args,
+            unique            => 1,
+        } ] })
+        or return '';
 
     $args->{ts} = $e->created_on;
@@ -115 +118 @@
     my $otag_cache = $r->stash('object_tags_cache:' . $blog_id) || {};
     if (!$otag_cache->{$tag_id}) {
-        my @otags = MT::ObjectTag->load({
-            blog_id => $blog_id,
-            tag_id => $tag_id,
-            object_datasource => MT::Entry->datasource,
-        });
-        $otag_cache->{$tag_id} = \@otags;
-        $r->stash('object_tags_cache:' . $blog_id, $otag_cache);
+        my @otags = MT::ObjectTag->load({
+            blog_id           => $blog_id,
+            tag_id            => $tag_id,
+            object_datasource => MT::Entry->datasource,
+        });
+        $otag_cache->{$tag_id} = \@otags;
+        $r->stash('object_tags_cache:' . $blog_id, $otag_cache);
     }
     $otag_cache->{$tag_id};
@@ -129 +132 @@
     my ($ctx, $args, $cond) = @_;
     my $entry = $ctx->stash('entry')
-        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
+        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
 
     my $weight = $args->{weight} || 'constant';
-    my $lastn = $args->{lastn} || 0;
+    my $lastn  = $args->{lastn}  || 0;
     my $offset = $args->{offset} || 0;
     $lastn += $offset;
-        
+        
     my $entry_id = $entry->id;
-    my $blog_id = $entry->blog_id;
+    my (%blog_terms, %blog_args);
+    $ctx->set_blog_load_context($args, \%blog_terms, \%blog_args)
+        or return $ctx->error($ctx->errstr);
+
     my @tags = MT::Tag->load(undef, {
-        sort => 'name',
-        join => [ 'MT::ObjectTag', 'tag_id', {
-            object_id => $entry_id,
-            blog_id => $blog_id,
-            object_datasource => MT::Entry->datasource,
-        }, {
-            unique => 1,
-        } ] })
-        or return '';
+        sort => 'name',
+        join => [ 'MT::ObjectTag', 'tag_id', {
+            %blog_terms,
+            object_id         => $entry_id,
+            object_datasource => MT::Entry->datasource,
+        }, {
+            %blog_args,
+            unique            => 1,
+        } ] })
+        or return '';
     my %tag_ids;
     foreach (@tags) {
-        $tag_ids{$_->id} = 1;
-        my @more = MT::Tag->load({ n8d_id => $_->n8d_id ? $_->n8d_id : $_->id });
-        $tag_ids{$_->id} = 1 foreach @more;
+        $tag_ids{$_->id} = 1;
+        my @more = MT::Tag->load({ n8d_id => $_->n8d_id ? $_->n8d_id : $_->id });
+        $tag_ids{$_->id} = 1 foreach @more;
     }
     my @tag_ids = keys %tag_ids;
@@ -158 +165 @@
     my %rank;
     if ($weight eq 'constant') {
-        if (MT::Object->driver->can('count_group_by')) {
-            my $iter = MT::ObjectTag->count_group_by({
-                blog_id => $blog_id,
-                tag_id => \@tag_ids,
+        if (MT::Object->driver->can('count_group_by')) {
+            my $iter = MT::ObjectTag->count_group_by({
+                %blog_terms,
+                tag_id            => \@tag_ids,
+                object_datasource => MT::Entry->datasource,
+            }, {
+                %blog_args,
+                group             => ['object_id'],
+            });
+            while (my ($count, $object_id) = $iter->()) {
+                $rank{$object_id} = $count;
+            }
+        } else {
+            my $iter = MT::ObjectTag->load_iter({
+                %blog_terms,
+                tag_id            => \@tag_ids,
+                object_datasource => MT::Entry->datasource,
+            }, {
+                %blog_args,
+            });
+            while (my $otag = $iter->()) {
+                $rank{$otag->object_id}++;
+            }
+        }
+    } elsif ($weight eq 'idf') {
+        for my $tag_id (@tag_ids) {
+            my @otags = MT::ObjectTag->load({
+                %blog_terms,
+                tag_id => $tag_id,
                 object_datasource => MT::Entry->datasource,
             }, {
-                group => ['object_id'],
+                %blog_args,
             });
-            while (my ($count, $object_id) = $iter->()) {
-                $rank{$object_id} = $count;
-            }
-        } else {
-            my $iter = MT::ObjectTag->load_iter({
-                blog_id => $blog_id,
-                tag_id => \@tag_ids,
-                object_datasource => MT::Entry->datasource,
-            });
-            while (my $otag = $iter->()) {
-                $rank{$otag->object_id}++;
-            }
-        }
-    } elsif ($weight eq 'idf') {
-        for my $tag_id (@tag_ids) {
-            my $otags = _object_tags($blog_id, $tag_id);
-            next if scalar @$otags == 1;
-            my $rank = 1 / (scalar @$otags - 1);
-            for my $otag (@$otags) {
-                $rank{$otag->object_id} += $rank;
-            }
-        }
+            next if scalar @otags == 1;
+            my $rank = 1 / (scalar @otags - 1);
+            for my $otag (@otags) {
+                $rank{$otag->object_id} += $rank;
+            }
+        }
     }
     delete $rank{$entry_id};
@@ -197 +213 @@
     my $i = 0;
     foreach (@eids) {
-        my $e = MT::Entry->load($_);
-        if ($e->status == MT::Entry::RELEASE()) {
-            next if $i < $offset;
-            push @entries, $e;
-            $i++;
-            last if $lastn && $i >= $lastn;
-        }
+        my $e = MT::Entry->load($_);
+        if ($e->status == MT::Entry::RELEASE()) {
+            next if $i < $offset;
+            push @entries, $e;
+            $i++;
+            last if $lastn && $i >= $lastn;
+        }
     }
 
@@ -211 +227 @@
     $i = 0;
     for my $e (@entries) {
-        local $ctx->{__stash}{entry} = $e;
-        local $ctx->{current_timestamp} = $e->created_on;
-        local $ctx->{modification_timestamp} = $e->modified_on;
-        my $out = $builder->build($ctx, $tokens, {
-            %$cond,
-            EntriesHeader => !$i,
-            EntriesFooter => !defined $entries[$i+1],
-        });
-        return $ctx->error($ctx->errstr) unless defined $out;
-        $res .= $out;
-        $i++;
+        local $ctx->{__stash}{entry} = $e;
+        local $ctx->{current_timestamp} = $e->created_on;
+        local $ctx->{modification_timestamp} = $e->modified_on;
+        my $out = $builder->build($ctx, $tokens, {
+            %$cond,
+            EntriesHeader => !$i,
+            EntriesFooter => !defined $entries[$i+1],
+        });
+        return $ctx->error($ctx->errstr) unless defined $out;
+        $res .= $out;
+        $i++;
     }
     $res;
@@ -229 +245 @@
     my ($ctx, $args, $cond) = @_;
     my $tag = $ctx->stash('Tag') or return '';
-    my $blog_id = $ctx->stash('blog_id') or return '';
-
-    my $otags = _object_tags($blog_id, $tag->id);
-    my @eids = map { $_->object_id } @$otags;
+    my (%blog_terms, %blog_args);
+    $ctx->set_blog_load_context($args, \%blog_terms, \%blog_args)
+        or return $ctx->error($ctx->errstr);
+
+    my @otags = MT::ObjectTag->load({
+        %blog_terms,
+        tag_id            => $tag_id,
+        object_datasource => MT::Entry->datasource,
+    }, {
+        %blog_args,
+    });
+    my @eids = map { $_->object_id } @otags;
 
     my $iter = MT::Tag->load_iter(undef, {
-        sort => 'name',
-        join => ['MT::ObjectTag', 'tag_id', {
-            blog_id => $blog_id,
-            object_id => \@eids,
-            object_datasource => MT::Entry->datasource,
-        }, {
-            unique => 1,
-        } ] });
+        sort => 'name',
+        join => ['MT::ObjectTag', 'tag_id', {
+            %blog_terms,
+            object_id         => \@eids,
+            object_datasource => MT::Entry->datasource,
+        }, {
+            %blog_args,
+            unique            => 1,
+        } ] });
 
     my @res;
@@ -248 +273 @@
     my $tokens = $ctx->stash('tokens');
     while (my $t = $iter->()) {
-        next if $t->is_private || ($t->id == $tag->id);
-        local $ctx->{__stash}{Tag} = $t;
-        local $ctx->{__stash}{tag_count} = undef;
-        local $ctx->{__stash}{tag_entry_count} = undef;
-        defined(my $out = $builder->build($ctx, $tokens))
-            or return $ctx->error($ctx->errstr);
-        push @res, $out;
+        next if $t->is_private || ($t->id == $tag->id);
+        local $ctx->{__stash}{Tag} = $t;
+        local $ctx->{__stash}{tag_count} = undef;
+        local $ctx->{__stash}{tag_entry_count} = undef;
+        defined(my $out = $builder->build($ctx, $tokens))
+            or return $ctx->error($ctx->errstr);
+        push @res, $out;
     }
     my $glue = $args->{glue} || '';
@@ -262 +287 @@
 sub archive_tags {
     my ($ctx, $args, $cond) = @_;
-    my $blog_id = $ctx->stash('blog_id') or return '';
     my $entries = force($ctx->stash('entries')) or return '';
+    my (%blog_terms, %blog_args);
+    $ctx->set_blog_load_context($args, \%blog_terms, \%blog_args)
+        or return $ctx->error($ctx->errstr);
 
     my @eids = map { $_->id } grep { $_->status == MT::Entry::RELEASE() } @$entries;
 
     my $iter = MT::Tag->load_iter(undef, {
-        sort => 'name',
-        join => ['MT::ObjectTag', 'tag_id', {
-            blog_id => $blog_id,
-            object_id => \@eids,
-            object_datasource => MT::Entry->datasource,
-        }, {
-            unique => 1,
-        } ] });
+        sort => 'name',
+        join => ['MT::ObjectTag', 'tag_id', {
+            %blog_terms,
+            object_id         => \@eids,
+            object_datasource => MT::Entry->datasource,
+        }, {
+            %blog_args,
+            unique            => 1,
+        } ] });
 
     my @res;
@@ -281 +309 @@
     my $tokens = $ctx->stash('tokens');
     while (my $t = $iter->()) {
-        next if $t->is_private;
-        local $ctx->{__stash}{Tag} = $t;
-        local $ctx->{__stash}{tag_count} = undef;
-        local $ctx->{__stash}{tag_entry_count} = undef;
-        defined(my $out = $builder->build($ctx, $tokens))
-            or return $ctx->error($ctx->errstr);
-        push @res, $out;
+        next if $t->is_private;
+        local $ctx->{__stash}{Tag} = $t;
+        local $ctx->{__stash}{tag_count} = undef;
+        local $ctx->{__stash}{tag_entry_count} = undef;
+        defined(my $out = $builder->build($ctx, $tokens))
+            or return $ctx->error($ctx->errstr);
+        push @res, $out;
     }
     my $glue = $args->{glue} || '';
@@ -315 +343 @@
     my $tokens = $ctx->stash('tokens');
     foreach (@tags) {
-        local $ctx->{__stash}{'Tag'} = $_;
-        local $ctx->{__stash}{tag_count} = undef;
-        defined(my $out = $builder->build($ctx, $tokens, $cond))
-            or return $ctx->error($ctx->errstr);
-        push @res, $out;
+        local $ctx->{__stash}{'Tag'} = $_;
+        local $ctx->{__stash}{tag_count} = undef;
+        defined(my $out = $builder->build($ctx, $tokens, $cond))
+            or return $ctx->error($ctx->errstr);
+        push @res, $out;
     }
     my $glue = $args->{glue} || '';
@@ -332 +360 @@
 
     $path . 'mt-xsearch.cgi' . '?blog_id=' . $ctx->stash('blog_id') .
-        '&amp;search_key=TagSupplementals' .
-        ($delimiter ? '&amp;delimiter=' . MT::Util::encode_url($delimiter) : '') .
-        '&amp;search=' . MT::Util::encode_url($tag->name);
+        '&amp;search_key=TagSupplementals' .
+        ($delimiter ? '&amp;delimiter=' . MT::Util::encode_url($delimiter) : '') .
+        '&amp;search=' . MT::Util::encode_url($tag->name);
 }
 
@@ -348 +376 @@
     my $tokens = $ctx->stash('tokens');
     foreach (@$tags) {
-        local $ctx->{__stash}{'Tag'} = $_;
-        local $ctx->{__stash}{tag_count} = undef;
-        defined(my $out = $builder->build($ctx, $tokens, $cond))
-            or return $ctx->error($ctx->errstr);
-        push @res, $out;
+        local $ctx->{__stash}{'Tag'} = $_;
+        local $ctx->{__stash}{tag_count} = undef;
+        defined(my $out = $builder->build($ctx, $tokens, $cond))
+            or return $ctx->error($ctx->errstr);
+        push @res, $out;
     }
     my $glue = $args->{glue} || '';
@@ -377 +405 @@
     my $tags = $args->{search} or MT->error('Search string is required.');
     my @tag_names = MT::Tag->split($delimiter, $tags)
-        or return [];
+        or return [];
     my $tag_count = scalar @tag_names;
 
     my @tags = MT::Tag->load_by_datasource(MT::Entry->datasource, {
-        is_private => 0,
-        $blog_id ? (blog_id => $blog_id) : (),
-        name => \@tag_names,
+        is_private => 0,
+        $blog_id ? (blog_id => $blog_id) : (),
+        name       => \@tag_names,
     });
     $self->{xsearch_tags} = \@tags;
@@ -390 +418 @@
     my @eids;
     if (MT::Object->driver->can('count_group_by')) {
-        my $iter = MT::ObjectTag->count_group_by({
-            blog_id => $blog_id,
-            tag_id => \@tag_ids,
-            object_datasource => MT::Entry->datasource,
-        }, {
-            group => ['object_id'],
-        });
-        while (my ($count, $object_id) = $iter->()) {
-            push @eids, $object_id if $count == $tag_count;
-        }
+        my $iter = MT::ObjectTag->count_group_by({
+            blog_id           => $blog_id,
+            tag_id            => \@tag_ids,
+            object_datasource => MT::Entry->datasource,
+        }, {
+            group => ['object_id'],
+        });
+        while (my ($count, $object_id) = $iter->()) {
+            push @eids, $object_id if $count == $tag_count;
+        }
     } else {
-        my $iter = MT::ObjectTag->load_iter({
-            blog_id => $blog_id,
-            tag_id => \@tag_ids,
-            object_datasource => MT::Entry->datasource,
-        });
-        my %count;
-        while (my $otag = $iter->()) {
-            $count{$otag->object_id}++;
-        }
-        foreach (keys %count) {
-            push @eids, $_ if $count{$_} == $tag_count;
-        }
+        my $iter = MT::ObjectTag->load_iter({
+            blog_id           => $blog_id,
+            tag_id            => \@tag_ids,
+            object_datasource => MT::Entry->datasource,
+        });
+        my %count;
+        while (my $otag = $iter->()) {
+            $count{$otag->object_id}++;
+        }
+        foreach (keys %count) {
+            push @eids, $_ if $count{$_} == $tag_count;
+        }
     }
     return [] unless scalar @eids;
@@ -419 +447 @@
     map { push @entries, MT::Entry->load($_) } @eids;
     @entries = $sort_order eq 'descend' ?
-        sort { $b->created_on <=> $a->created_on } @entries :
-        sort { $a->created_on <=> $b->created_on } @entries;
+        sort { $b->created_on <=> $a->created_on } @entries :
+        sort { $a->created_on <=> $b->created_on } @entries;
     splice(@entries, $lastn) if $lastn && (scalar @entries > $lastn);