svn commit: r1924682 - in /spamassassin/trunk: lib/Mail/SpamAssassin/SQLBasedAddrList.pm t/sa_txrep_sql.t

[gb...@apache.org]

Author: gbechis
Date: Fri Mar 28 14:32:13 2025
New Revision: 1924682

URL: http://svn.apache.org/viewvc?rev=1924682&view=rev
Log:
revert r1924602

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
    spamassassin/trunk/t/sa_txrep_sql.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm?rev=1924682&r1=1924681&r2=1924682&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Fri Mar 28 14:32:13 2025
@@ -226,7 +226,7 @@ sub get_addr_entry {
       $cnt++;
     }
     $sth->finish();
-    return $entry if ($rc and ($cnt > 0));
+    return $entry if $rc;
   }
   undef $sth;
   undef $rc;
@@ -333,7 +333,7 @@ sub add_score {
       @signedby = !defined $signedby ? () : split(' ', lc $signedby);
       @signedby = ( '' )  if !@signedby;
     }
-    my @args = ($self->{_username}, $email, $ip, $entry->{msgcount}, $score);
+    my @args = ($self->{_username}, $email, $ip, 1, $score);
     my $sql = sprintf("INSERT INTO %s (%s) VALUES (%s)", $self->{tablename},
                       join(',', @fields),  join(',', ('?') x @fields));
     if ($self->{dsn} =~ /^DBI:(?:pg|SQLite)/i) {

Modified: spamassassin/trunk/t/sa_txrep_sql.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_txrep_sql.t?rev=1924682&r1=1924681&r2=1924682&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_txrep_sql.t (original)
+++ spamassassin/trunk/t/sa_txrep_sql.t Fri Mar 28 14:32:13 2025
@@ -65,7 +65,7 @@ tstpre ("
 clear_localrules();
 
 %txrep_pattern0 = (
-  q{ 250 TXREP } => 'Score normalizing',
+  q{ 98 TXREP } => 'Score normalizing',
 );
 if (SQLITE) {
   my $db = "$workdir/txrep.db";