X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdrrewrited;h=d117f569e92c0a966cad571946c2c40d290b7eff;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hp=34a20684949702ec88a2c78186e51fbe8e11e2a7;hpb=92713b3eb2e1511b71e850af3e47296cbf5bc24f;p=freeside.git diff --git a/FS/bin/freeside-cdrrewrited b/FS/bin/freeside-cdrrewrited old mode 100644 new mode 100755 index 34a206849..d117f569e --- a/FS/bin/freeside-cdrrewrited +++ b/FS/bin/freeside-cdrrewrited @@ -63,12 +63,11 @@ while (1) { foreach my $cdr ( qsearch( { 'table' => 'cdr', - 'extra_sql' => 'FOR UPDATE', #XXX overwritten by opt below...would fixing this break anything? 'hashref' => {}, 'extra_sql' => 'WHERE freesidestatus IS NULL '. ' AND freesiderewritestatus IS NULL '. $extra_sql. - ' LIMIT 1024', #arbitrary, but don't eat too much memory + ' LIMIT 1024 FOR UPDATE', #arbitrary, but don't eat too much memory } ) ) { @@ -88,7 +87,7 @@ while (1) { if ($isdup) { #we only act on this cdr, not touching previous dupes #if a dupe somehow creeped in previously, too late to fix it - $cdr->freesidestatus('done'); #prevent it from being billed + $cdr->freesidestatus('skipped'); #prevent it from being billed push(@status,'duplicate'); } } @@ -294,7 +293,7 @@ of the following config options are enabled: =item cdr-skip_duplicate_rewrite -Marks as 'done' (prevents billing for) any CDRs with +Marks as 'skipped' (prevents billing for) any CDRs with a src, dst and calldate identical to an existing CDR =item cdr-asterisk_australia_rewrite