Changeset 13618

Timestamp:

06/10/08 21:07:09 (5 years ago)

Author:

cho45

Message:

Made faster keyword search.
Fixed crush bug on full-text search.

Files:

• lang/ruby/Chemr/CHMDocument.rb (modified) (2 diffs)

lang/ruby/Chemr/CHMDocument.rb

@@ -175 +175 @@
                 }.sort_by {|k,v| k.length }
 
+                @search_thread.kill rescue nil
                 if @now.length.zero?
-                        r = /(#{str.split(//).map {|c| Regexp.escape(c) }.join(").*?(")})/i
-                        @now.concat @index.select {|k,v|
-                                k =~ r
-                        }.sort_by {|k,v|
-                                # 文字が前のほうに集っているほど高ランクになるように
-                                m = r.match(k)
-                                (0...m.size).map {|i| m.begin(i) }.inject {|p,i| p + i }
-                        }
+                        @now << ["Loading...", [""]]
+                        @search_thread = Thread.start(str) do |str|
+                                r = /(#{str.split(//).map {|c| Regexp.escape(c) }.join(").*?(")})/i
+                                @now = @index.sort_by {|k,v|
+                                        # 文字が前のほうに集っているほど高ランクになるように
+                                        m = r.match(k)
+                                        !m ? Float::MAX : (0...m.size).map {|i| m.begin(i) }.inject {|p,i| p + i }
+                                }.first(30)
+                                @list.reloadData
+                        end
 
                         @list.usesAlternatingRowBackgroundColors = false
@@ -318 +321 @@
                         },
                         "C-\r" => Proc.new {|s|
-                                @now = @chm.search(@search.stringValue).map {|title,url|
+                                @now = (@chm.search(@search.stringValue) || []).map {|title,url|
                                         [title, [url]]
                                 }