Changeset 6112

Timestamp:

02/03/08 19:03:37 (5 years ago)

Author:

hsbt

Message:

platform/tdiary/plugin/spambayes.rb: backport form official repos.

Files:

• platform/tdiary/plugin/spambayes.rb (modified) (5 diffs)

platform/tdiary/plugin/spambayes.rb

@@ -130 +130 @@
 <li><a href="#{update_url}?conf=spambayes;sb_mode=show_comment">#{Res.check_comment}</a></li>
 <li><a href="#{update_url}?conf=spambayes;sb_mode=show_all_referer">#{Res.check_referer}</a></li>
-<li><a href="#{update_url}?conf=spambayes;sb_mode=show_spam_tokens">#{Res.token_list("SPAM")}</a></li>
-<li><a href="#{update_url}?conf=spambayes;sb_mode=show_ham_tokens">#{Res.token_list("HAM")}</a></li>
+<li><a href="#{update_url}?conf=spambayes;sb_mode=show_spam_tokens">#{Res.token_list("Spam")}</a></li>
+<li><a href="#{update_url}?conf=spambayes;sb_mode=show_ham_tokens">#{Res.token_list("Ham")}</a></li>
 <li><a href="#{update_url}?conf=spambayes;sb_mode=confirm_rebuild_db">#{Res.rebuild_db}</a></li>
 </ul>
@@ -178 +178 @@
                 ham_list = Dir["#{bayes_cache}/H*"].map{|i| File.basename(i)}.sort
                 doubt_list = Dir["#{bayes_cache}/D*"].map{|i| File.basename(i)}.sort
-                r << "<h2>HAM</h2><ul>"
+                r << "<h2>Ham</h2><ul>"
                 ham_list.each do |f|
                         data = Comment.load(data_file(f))
                         r << "<li>\n#{show_comment(data, f)}\n</li>\n"
                 end
-                r << "</ul><h2>DOUBT</h2><ul>"
+                r << "</ul><h2>Doubt</h2><ul>"
                 doubt_list.each do |f|
                         data = Comment.load(data_file(f))
                         r << "<li>\n#{show_comment(data, f)}\n</li>\n"
                 end
-                r << "</ul><h2>SPAM</h2><ul>"
+                r << "</ul><h2>Spam</h2><ul>"
                 spam_list.each do |f|
                         data = Comment.load(data_file(f))
@@ -273 +273 @@
                 return "" if tokens.empty?
                 r = "<h3>#{label}</h3>\n"
-                r << "<table border='1'><tr><th>#{Res.token}</th><th>#{Res.probability("SPAM")}</th></tr>"
+                r << "<table border='1'><tr><th>#{Res.token}</th><th>#{Res.probability("Spam")}</th></tr>"
                 bf = bayes_filter
                 tokens = tokens.sort do |a, b|
@@ -292 +292 @@
                 tl = {}
                 token_list.uniq.each do |t|
-                        k = case t
-                            when /^A (.*)/
-                               :addr
-                            when /^M (.*)/
-                               :mail
-                            when /^N (.*)/
-                               :name
-                            when /^R (.*)/
-                               :referer
-                            when /^U (.*)/
-                               :url
-                            else
-                               :body
-                            end
+                        k =
+                                case t
+                                when /^A (.*)/
+                                        :addr
+                                when /^M (.*)/
+                                        :mail
+                                when /^N (.*)/
+                                        :name
+                                when /^R (.*)/
+                                        :referer
+                                when /^U (.*)/
+                                        :url
+                                else
+                                        :body
+                                end
 
                         tl[k] ||= []
@@ -359 +360 @@
                 when :ham
                         add_ham(data, true)
-                        r << Res.registered_as(:HAM)
                 when :spam
                         add_spam(data)
-                        r << Res.registered_as(:SPAM)
-                end
+                end
+                r << Res.registered_as(type)
                 save_db
                 register_data(id, type)