Changeset 85 for all-keywords/trunk/all-keywords.pl

Timestamp:

06/16/05 12:33:16 (4 years ago)

Author:

ogawa

Message:

Support much more patterns of multiple keywords.
Now MTAllKeywords and MTEntryAllKeywords doesn't require "delimiter" options (they would be ignored if specified).

Files:

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

all-keywords/trunk/all-keywords.pl

@@ -1 +1 @@
 # A plugin for adding keywords-handling tags
 #
-# Release 0.13 (Jun 11, 2005)
+# $Id$
 #
 # This software is provided as-is. You may use it for commercial or 
@@ -22 +22 @@
 };
 
+#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_entry_tags);
+#}
+
 MT::Template::Context->add_container_tag('AllKeywords' => \&all_keywords);
 MT::Template::Context->add_container_tag('EntryAllKeywords' => \&entry_all_keywords);
@@ -31 +37 @@
 MT::Template::Context->add_container_tag('MostRelatedEntries' => \&most_related_entries);
 
-sub split_keywords {
+sub split_args {
     my ($string, $delimiter, $case_sensitive) = @_;
     return unless $string;
     my @keywords;
-    $string =~ s/^\s+//;
-    $string =~ s/\s+$//;
+    $string =~ s/(^\s+|\s+$)//g;
     $string = lc $string unless $case_sensitive;
-    return $delimiter ?
-        map { s/^\s+//; s/\s+$//; $_ } split($delimiter, $string) :
-        split(/\s+/, $string);
+
+    return split(/\s+/, $string) unless $delimiter;
+
+    foreach my $keyword (split($delimiter, $string)) {
+        $keyword =~ s/(^\s+|\s+$)//g;
+        push @keywords, $keyword if $keyword;
+    }
+    @keywords;
+}
+
+sub split_keywords {
+    my ($string, $case_sensitive) = @_;
+    return unless $string;
+    my @keywords;
+    $string =~ s/(^\s+|\s+$)//g;
+    $string = lc $string unless $case_sensitive;
+
+    # keywords w/o whitespaces
+    return split(/\s+/, $string) unless $string =~ m/[[]"';,|]?/;
+
+    # keywords w/ whitespaces
+    while ($string =~ m/(\[[^]]+\]|"[^"]+"|'[^']+'|[^;,|]+)/g) {
+        my $keyword = $1;
+        $keyword =~ s/(^[\["'\s;,|]+|[\]"'\s;,|]+$)//g;
+        push @keywords, $keyword if $keyword;
+    }
+    @keywords;
 }
 
@@ -52 +81 @@
     # lastn option (default = 0, no cutoff)
     my $lastn = $args->{lastn} || 0;
-    # delimiter option (default = space characters)
-    my $delimiter = $args->{delimiter} || '';
     # case_sensitive option (0/1, default = 1)
     my $case_sensitive = defined $args->{case_sensitive} ?
@@ -65 +92 @@
     while (my $e = $iter->()) {
         next unless $e->keywords;
-        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
+        my @keywords = split_keywords($e->keywords, $case_sensitive);
         foreach my $keyword (@keywords) {
             if (exists($all_keywords{$keyword})) {
@@ -121 +148 @@
     return '' unless $e->keywords;
 
-    # delimiter option (default = space characters)
-    my $delimiter = $args->{delimiter} || '';
     # case_sensitive option (0/1, default = 1)
     my $case_sensitive = defined $args->{case_sensitive} ?
         $args->{case_sensitive} : 1;
 
-    my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
+    my @keywords = split_keywords($e->keywords, $case_sensitive);
     my $total = scalar(@keywords);
     $ctx->stash('all_keywords_total', $total);
@@ -185 +210 @@
                                       direction => $sort_order });
     my @entries;
-    my @patterns = split_keywords($keywords, $delimiter, $case_sensitive);
+    my @patterns = split_args($keywords, $delimiter, $case_sensitive);
     my $i = 0;
     while (my $e = $iter->()) {
         last if $lastn && $i >= $lastn;
         next unless $e->keywords;
-        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
+        my @keywords = split_keywords($e->keywords, $case_sensitive);
         my $check = 1;
         foreach my $pattern (@patterns) {
@@ -235 +260 @@
     return '' unless $entry->keywords;
 
-    # delimiter option (default = space characters)
-    my $delimiter = $args->{delimiter} || '';
     # case_sensitive option (0/1, default = 0)
     my $case_sensitive = $args->{case_sensitive} || 0;
@@ -242 +265 @@
     my $lastn = $args->{lastn} || 0;
 
-    my @patterns = split_keywords($entry->keywords, $delimiter, $case_sensitive);
+    my @patterns = split_keywords($entry->keywords, $case_sensitive);
 
     my $blog_id = $ctx->stash('blog_id');
@@ -255 +278 @@
         next unless $e->keywords;
         next if $e->id == $entry->id;
-        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
+        my @keywords = split_keywords($e->keywords, $case_sensitive);
         my $count = 0;
         foreach my $pattern (@patterns) {
@@ -294 +317 @@
 }
 
-eval("use MT::XSearch;");
-if (!$@) {
+eval {
+    require MT::XSearch;
     MT::XSearch->add_search_plugin('AllKeywords', {
         label => 'Keyword Search',
@@ -301 +324 @@
         on_execute => \&xsearch_on_execute,
         on_stash => \&xsearch_on_stash });
-}
+};
 
 sub xsearch_on_stash {
@@ -319 +342 @@
     my $case_sensitive = $args->{case_sensitive} || 0;
 
-    my @patterns = split_keywords($args->{search}, $delimiter, $case_sensitive);
+    my @patterns = split_args($args->{search}, $delimiter, $case_sensitive);
     my $iter = MT::Entry->load_iter({ blog_id => $blog_id,
                                       status => MT::Entry::RELEASE() },
@@ -327 +350 @@
     while (my $e = $iter->()) {
         next unless $e->keywords;
-        my @keywords = split_keywords($e->keywords, $delimiter, $case_sensitive);
+        my @keywords = split_keywords($e->keywords, $case_sensitive);
         my $check = 1;
         foreach my $pattern (@patterns) {