[freeside-commits] freeside/FS/bin freeside-cdrrewrited,1.8,1.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/bin
In directory wavetail.420.am:/tmp/cvs-serv30829

Modified Files:
	freeside-cdrrewrited 
Log Message:
better retry behavior for non-found taqua CDR rewrites, RT#12181

Index: freeside-cdrrewrited
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/bin/freeside-cdrrewrited,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- freeside-cdrrewrited	9 May 2011 20:15:57 -0000	1.8
+++ freeside-cdrrewrited	9 May 2011 20:23:23 -0000	1.9
@@ -45,15 +45,8 @@
                  keys %accountcode_unmatch;
   #hmm :/
   my $extra_sql = '';
-  if ( @recent ) {
-    $extra_sql .= ' AND '.
-      join(' AND ',
-                    map { my($sessionnum,$src) = split(',', $_);
-                          "( sessionnum != '$sessionnum' OR src != '$src' )";
-                        }
-                      @recent
-          );
-  }
+  $extra_sql .= ' AND acctid NOT IN (', join(',', @recent). ') '
+    if @recent;
 
   my $found = 0;
   foreach my $cdr ( 
@@ -117,7 +110,7 @@
           $cdr->status('done'); #so it doesn't try to rate
         } else {
           warn "WARNING: $cantfind; will keep trying\n";
-          $accountcode_unmatch{$cdr->sessionnum.','.$cdr->subscriber} = time;
+          $accountcode_unmatch{$cdr->acctid} = time;
           next;
         }