Changeset 94

Timestamp:

06/23/05 19:28:42 (3 years ago)

Author:

ogawa

Message:

Now support Request caching for DB when PluginData? is not available.

Files:

• tagwire/trunk/tagwire.pl (modified) (22 diffs)

tagwire/trunk/tagwire.pl

@@ -13 +13 @@
 use MT::Template::Context;
 
+# DEBUG
+my $FORCE_PD_REFRESH = 0;
+my $ENABLE_PD_INDEXES = 1;
+my $ENABLE_REQ_CACHE = 1;
+
 my $plugin;
 eval {
@@ -24 +29 @@
 
 if (MT->can('add_callback')) {
-  my $mt = MT->instance;
-  MT->add_callback((ref $mt eq 'MT::App::CMS' ? 'AppPostEntrySave' : 'MT::Entry::post_save'),
-                   10, $plugin, \&update_indexes);
-}
-
-my $FORCE_REFRESH = 0;
-sub update_indexes {
+    my $mt = MT->instance;
+    MT->add_callback((ref $mt eq 'MT::App::CMS' ? 'AppPostEntrySave' : 'MT::Entry::post_save'),
+                     10, $plugin, \&update_pd_indexes);
+}
+
+sub update_pd_indexes {
+    return unless $ENABLE_PD_INDEXES && $plugin;
     my ($eh, $app, $entry) = @_;
-    return unless $plugin;
     require MT::Entry;
     my $blog_id = $entry->blog_id;
@@ -40 +44 @@
     my (%eindex, %tindex);
     my $data;
-    if (!$pd || $FORCE_REFRESH) {
+    if (!$pd || $FORCE_PD_REFRESH) {
         $pd = new MT::PluginData();
         $pd->plugin($plugin->name);
@@ -78 +82 @@
 MT::Template::Context->add_tag('TagsTotal' => \&tags_total);
 MT::Template::Context->add_tag('TagsTotalSum' => \&tags_total_sum);
-MT::Template::Context->add_container_tag('EntriesWithKeywords' => \&entries_with_keywords);
+MT::Template::Context->add_container_tag('EntriesWithTags' => \&entries);
 MT::Template::Context->add_container_tag('MostRelatedEntries' => \&most_related_entries);
 
-# For compatibility (this plugin formely named AllKeywords Plugin)
+# For compatibility (this plugin was formerly named 'AllKeywords')
 MT::Template::Context->add_container_tag('AllKeywords' => \&tags);
 MT::Template::Context->add_container_tag('EntryAllKeywords' => \&entry_tags);
@@ -88 +92 @@
 MT::Template::Context->add_tag('AllKeywordsTotal' => \&tags_total);
 MT::Template::Context->add_tag('AllKeywordsTotalSum' => \&tags_total_sum);
+MT::Template::Context->add_container_tag('EntriesWithKeywords' => \&entries);
 
 sub split_args {
@@ -131 +136 @@
 
 use MT::Request;
-sub get_pdata {
-    return undef unless $plugin;
-    my ($blog_id) = @_;
-    my $r = MT::Request->instance;
-    my $cache = $r->cache('Tagwire::Cache');
-    return $cache->{data} if $cache && ($cache->{blog_id} == $blog_id);
-    $r->cache('Tagwire::Cache', undef);
-    
+sub get_pd_indexes {
+    return unless $ENABLE_PD_INDEXES && $plugin;
+    my $blog_id = $_[0] or return;
+    my ($r, $cname);
+    if ($ENABLE_REQ_CACHE) {
+        $r = MT::Request->instance;
+        $cname = 'Tagwire::Cache::' . $blog_id;
+        return $r->cache($cname) if defined $r->cache($cname);
+        $r->cache($cname, undef);
+    }
     my $data;
     eval {
@@ -146 +153 @@
         $data = $pd->data() if $pd;
     };
-    if ($data) {
-        $cache->{blog_id} = $blog_id;
-        $cache->{data} = $data;
-        $r->cache('Tagwire::Cache', $cache);
-    }
+    $r->cache($cname, $data) if $ENABLE_REQ_CACHE && $data;
+    $data;
+}
+
+sub get_db_indexes {
+    my $blog_id = $_[0] or return;
+    my ($r, $cname);
+    if ($ENABLE_REQ_CACHE) {
+        $r = MT::Request->instance;
+        $cname = 'Tagwire::Cache::' . $blog_id;
+        return $r->cache($cname) if defined $r->cache($cname);
+        $r->cache($cname, undef);
+    }
+    my $data;
+    my (%eindex, %tindex);
+    my $iter = MT::Entry->load_iter({ blog_id => $blog_id,
+                                      status => MT::Entry::RELEASE() });
+    while (my $e = $iter->()) {
+        my @tags = split_tags($e->keywords, 1) or next;
+        $eindex{$e->id} = { tags => \@tags,
+                            created_on => $e->created_on };
+    }
+    foreach my $eid (keys %eindex) {
+        map { push @{$tindex{$_}}, $eid } @{$eindex{$eid}->{tags}};
+    }
+    $data->{eindex} = \%eindex;
+    $data->{tindex} = \%tindex;
+    $r->cache($cname, $data) if $ENABLE_REQ_CACHE;
     $data;
 }
@@ -158 +188 @@
 
     # sort_by option (tag/tag-case/count, default = tag)
-    my $sort_by = $args->{sort_by} || 'keyword';
+    my $sort_by = $args->{sort_by} || 'tag';
     # sort_order option (ascend/descend, default = ascend)
     my $sort_order = $args->{sort_order} || 'ascend';
@@ -170 +200 @@
     my %tags = ();
 
-    my $data = get_pdata($blog_id);
+    my $data = get_pd_indexes($blog_id) || get_db_indexes($blog_id);
     if ($data) {
         my %tindex = %{$data->{tindex}};
@@ -234 +264 @@
     my ($ctx, $args, $cond) = @_;
     my $e = $ctx->stash('entry')
-        or return $ctx->_no_entry_error('MTEntryTas');
+        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
     return '' unless $e->keywords;
 
@@ -276 +306 @@
 }
 
-sub entries_with_keywords {
+sub entries {
     my ($ctx, $args, $cond) = @_;
 
-    # keywords option (must be specified)
-    my $keywords = $args->{keywords} or return '';
+    # tags(keywords) option (REQUIRED)
+    my $search = $args->{tags} || $args->{keywords} or return '';
     # delimiter option (default = space characters)
     my $delimiter = $args->{delimiter} || '';
@@ -288 +318 @@
     # sort_by option (title/status/created_on/modified_on/author_id/excerpt, default = created_on)
     my $sort_by = $args->{sort_by} || 'created_on';
-    # sort_order option (ascend/descend, default = ascend)
+    # sort_order option (ascend/descend, default = descend)
     my $sort_order = $args->{sort_order} || 'descend';
     # lastn option (default = 0, no cutoff)
@@ -295 +325 @@
     my $blog_id = $ctx->stash('blog_id');
     my @entries;
-    my @patterns = split_args($keywords, $delimiter, $case_sensitive);
-
-    my $data = get_pdata($blog_id);
+    my @patterns = split_args($search, $delimiter, $case_sensitive);
+
+    my $data = get_pd_indexes($blog_id) || get_db_indexes($blog_id);
     if ($data) {
         my %tindex = %{$data->{tindex}};
@@ -305 +335 @@
             foreach my $tag (@patterns) {
                 foreach my $eid (@{$tindex{$tag}}) {
-                    $match{$eid} = exists $match{$eid} ?
-                        $match{$eid} + 1 : 1;
+                    $match{$eid} = exists $match{$eid} ? $match{$eid} + 1 : 1;
                 }
             }
         } else {
             foreach my $tag (@patterns) {
-                foreach my $mtag (grep { lc $_ == $tag } keys %tindex) {
+                foreach my $mtag (grep { lc $_ eq $tag } keys %tindex) {
                     foreach my $eid (@{$tindex{$mtag}}) {
-                        $match{$eid} = exists $match{$eid} ?
-                            $match{$eid} + 1 : 1;
+                        $match{$eid} = exists $match{$eid} ? $match{$eid} + 1 : 1;
                     }
                 }
@@ -322 +350 @@
         my @eids = grep { $match{$_} == $count } keys %match or return;
         @eids = sort { $eindex{$b}->{created_on} <=> $eindex{$a}->{created_on} } @eids;
+        @eids = $sort_order eq 'descend' ?
+            sort { $eindex{$b}->{created_on} <=> $eindex{$a}->{created_on} } @eids :
+            sort { $eindex{$a}->{created_on} <=> $eindex{$b}->{created_on} } @eids;
         require MT::Entry;
         map { push @entries, MT::Entry->load($_) } @eids;
-        # The above code is sticked to "created_on", "descend".
+        # The above code is sticked to "created_on".
     } else {
         require MT::Entry;
@@ -378 +409 @@
     my ($ctx, $args, $cond) = @_;
     my $entry = $ctx->stash('entry')
-        or return $ctx->_no_entry_error('MTMostRelatedEntries');
+        or return $ctx->_no_entry_error('MT' . $ctx->stash('tag'));
     return '' unless $entry->keywords;
 
@@ -394 +425 @@
     my %match = ();
 
-    my $data = get_pdata($blog_id);
+    my $data = get_pd_indexes($blog_id) || get_db_indexes($blog_id);
     if ($data) {
         my %tindex = %{$data->{tindex}};
@@ -409 +440 @@
         } else {
             foreach my $tag (@patterns) {
-                foreach my $mtag (grep { lc $_ == $tag } keys %tindex) {
+                foreach my $mtag (grep { lc $_ eq $tag } keys %tindex) {
                     foreach my $eid (@{$tindex{$mtag}}) {
                         next if $eid == $entry->id;
@@ -492 +523 @@
     my $args = shift;
     require MT::Entry;
-    my $blog_id = $args->{blog_id} or
-        MT->error('A Blog ID is required.');
+    my $blog_id = $args->{blog_id} or MT->error('Blog ID is required.');
     my $sort_by = $args->{sort_by} || 'created_on';
     my $sort_order = $args->{sort_order} || 'descend';
@@ -503 +533 @@
     my @patterns = split_args($args->{search}, $delimiter, $case_sensitive);
 
-    my $data = get_pdata($blog_id);
+    my $data = get_pd_indexes($blog_id) || get_db_indexes($blog_id);
     if ($data) {
         my %tindex = %{$data->{tindex}};
@@ -517 +547 @@
         } else {
             foreach my $tag (@patterns) {
-                foreach my $mtag (grep { lc $_ == $tag } keys %tindex) {
+                foreach my $mtag (grep { lc $_ eq $tag } keys %tindex) {
                     foreach my $eid (@{$tindex{$mtag}}) {
                         $match{$eid} = exists $match{$eid} ?
@@ -528 +558 @@
         my @eids = grep { $match{$_} == $count } keys %match
             or return;
-        @eids = sort { $eindex{$b}->{created_on} <=> $eindex{$a}->{created_on} } @eids;
+        @eids = $sort_order eq 'descend' ?
+            sort { $eindex{$b}->{created_on} <=> $eindex{$a}->{created_on} } @eids :
+            sort { $eindex{$a}->{created_on} <=> $eindex{$b}->{created_on} } @eids;
         require MT::Entry;
         map { push @results, MT::Entry->load($_) } @eids;
-        # The above code is sticked to "created_on", "descend".
+        # The above code is sticked to "created_on".
     } else {
         my $iter = MT::Entry->load_iter({ blog_id => $blog_id,