Changeset 22

Timestamp:

04/06/05 20:25:07 (4 years ago)

Author:

ogawa

Message:

code cleanup

Files:

• all-keywords/trunk/all-keywords.pl (modified) (8 diffs)

all-keywords/trunk/all-keywords.pl

@@ -1 +1 @@
 # A plugin for adding keywords-handling tags
 #
-# Release 0.11 (Mar 20, 2005)
+# Release 0.12 (Mar 23, 2005)
 #
 # This software is provided as-is. You may use it for commercial or 
@@ -15 +15 @@
     require MT::Plugin;
     my $plugin = new MT::Plugin();
-    $plugin->name("AllKeywords Plugin 0.11");
+    $plugin->name("AllKeywords Plugin 0.12");
     $plugin->description("Add MTAllKeywords tags for listing blog-wide keywords and entry keywords");
     $plugin->doc_link("http://as-is.net/hacks/2005/03/allkeywords_plugin.html");
@@ -30 +30 @@
 MT::Template::Context->add_container_tag('MostRelatedEntries' => \&most_related_entries);
 
+sub split_keywords {
+    my ($string, $delimiter, $case_sensitive) = @_;
+    return unless $string;
+    my @keywords;
+    $string =~ s/^\s+//;
+    $string =~ s/\s+$//;
+    $string = lc $string unless $case_sensitive;
+    return $delimiter ?
+        map { s/^\s+//; s/\s+$//; $_ } split($delimiter, $string) :
+        split(/\s+/, $string);
+}
+
 sub all_keywords {
     my ($ctx, $args, $cond) = @_;
@@ -51 +63 @@
     while (my $e = $iter->()) {
         next unless $e->keywords;
-        my $e_keywords = $case_sensitive ? $e->keywords : lc $e->keywords;
-        my @keywords = $delimiter ?
-            split($delimiter, $e_keywords) : split(/\s+/, $e_keywords);
+        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
         foreach my $keyword (@keywords) {
             if (exists($all_keywords{$keyword})) {
@@ -109 +119 @@
     my $case_sensitive = $args->{case_sensitive} || 1;
 
-    my $e_keywords = $case_sensitive ? $e->keywords : lc $e->keywords;
-    my @keywords = $delimiter ?
-        split($delimiter, $e_keywords) : split(/\s+/, $e_keywords);
+    my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
     my $res = '';
     my $builder = $ctx->stash('builder');
@@ -167 +175 @@
                                       direction => $sort_order });
     my @entries;
-    $keywords = lc $keywords unless $case_sensitive;
-    my @patterns = $delimiter ?
-        split($delimiter, $keywords) : split(/\s+/, $keywords);
+    my @patterns = split_keywords($keywords, $delimiter, $case_sensitive);
     my $i = 0;
     while (my $e = $iter->()) {
         last if $lastn && $i >= $lastn;
         next unless $e->keywords;
-        my $e_keywords = $case_sensitive ? $e->keywords : lc $e->keywords;
-        my @keywords = $delimiter ?
-            split($delimiter, $e_keywords) : split(/\s+/, $e_keywords);
+        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
         my $check = 1;
         foreach my $pattern (@patterns) {
@@ -228 +232 @@
     my $lastn = $args->{lastn} || 0;
 
-    my $entry_keywords = $case_sensitive ? $entry->keywords : lc $entry->keywords;
-    my @patterns = $delimiter ?
-        split($delimiter, $entry_keywords) : split(/\s+/, $entry_keywords);
+    my @patterns = split_keywords($entry->keywords, $delimiter, $case_sensitive);
 
     my $blog_id = $ctx->stash('blog_id');
@@ -243 +245 @@
         next unless $e->keywords;
         next if $e->id == $entry->id;
-        my $e_keywords = $case_sensitive ? $e->keywords : lc $e->keywords;
-        my @keywords = $delimiter ?
-            split($delimiter, $e_keywords) : split(/\s+/, $e_keywords);
+        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
         my $count = 0;
         foreach my $pattern (@patterns) {