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

Timestamp:

06/20/05 10:09:18 (4 years ago)

Author:

ogawa

Message:

Brush split_keywords algorithm.

Files:

• all-keywords/trunk/all-keywords.pl (modified) (1 diff)

all-keywords/trunk/all-keywords.pl

@@ -60 +60 @@
     $string = lc $string unless $case_sensitive;
 
-    # keywords separated by whitespaces
-    return split(/\s+/, $string) unless $string =~ m/[\[\]"';,|]/;
-
-    # keywords separated by non-whitespaces
-    while ($string =~ m/(\[[^]]+\]|"[^"]+"|'[^']+'|[^;,|]+)/g) {
-        my $keyword = $1;
-        $keyword =~ s/(^[\["'\s;,|]+|[\]"'\s;,|]+$)//g;
-        push @keywords, $keyword if $keyword;
+    if ($string =~ m/[;,|]/) {
+        # keywords separated by non-whitespaces
+        while ($string =~ m/(\[[^]]+\]|"[^"]+"|'[^']+'|[^;,|]+)/g) {
+            my $keyword = $1;
+            $keyword =~ s/(^[\["'\s;,|]+|[\]"'\s;,|]+$)//g;
+            push @keywords, $keyword if $keyword;
+        }
+    } else {
+        # keywords separated by whitespaces
+        while ($string =~ m/(\[[^]]+\]|"[^"]+"|'[^']+'|[^\s]+)/g) {
+            my $keyword = $1;
+            $keyword =~ s/(^[\["'\s]+|[\]"'\s]+$)//g;
+            push @keywords, $keyword if $keyword;
+        }
     }
     @keywords;