Re: spam-check-spamassassin-headers with spamassasin 3.0/3.1

[Reiner Steib <reinersteib+gmane@imap.cc>]

On Sat, Feb 25 2006, IRIE Tetsuya wrote:

[ "hits=" vs. "score=" ]
> Score displayed in summary buffer becomes incorrect if using with
> spamassassin 3.x.
> (info "(gnus)Spam ELisp Package Sorting and Score Display in Summary
> Buffer")
>
> I think that a similar change is necessary also for
> `spam-extra-header-to-number'.

Could you try the following patch, please?

--8<---------------cut here---------------start------------->8---
--- spam.el	14 Feb 2006 15:57:49 +0100	7.78
+++ spam.el	25 Feb 2006 22:26:08 +0100	
@@ -1173,6 +1173,11 @@
 	(return))))
     result))
 
+(defvar spam-spamassassin-score-regexp "\\(?:score\\|hits\\)=\\(-?[0-9.]+\\)"
+  "Regexp matching SpamAssassin score header.
+The first group must match the number.")
+;; "score" for Spamassassin 3.0 or later.
+
 (defun spam-extra-header-to-number (header headers)
   "Transform an extra HEADER to a number, using list of HEADERS.
 Note this has to be fast."
@@ -1181,7 +1186,8 @@
        ((eq header 'X-Spam-Status)
 	(string-to-number (gnus-replace-in-string
 			   (gnus-extra-header header headers)
-			   ".*hits=" "")))
+			   spam-spamassassin-score-regexp
+			   "\\1")))
        ;; for CRM checking, it's probably faster to just do the string match
        ((and spam-use-crm114 (string-match "( pR: \\([0-9.-]+\\)" header))
 	(match-string 1 header))
@@ -2615,8 +2621,7 @@
   (if score				; scoring mode
       (let ((header (message-fetch-field spam-spamassassin-spam-status-header)))
 	(when header
-	  (if (string-match "\\(?:score\\|hits\\)=\\(-?[0-9.]+\\)" header)
-	      ;; "score" for Spamassassin 3.0 or later.
+	  (if (string-match spam-spamassassin-score-regexp header)
 	      (match-string 1 header)
 	    "0")))
     ;; spam detection mode
--8<---------------cut here---------------end--------------->8---

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/