[svn-commits] rmudgett: branch 1.8 r401577 - /branches/1.8/cdr/cdr_adaptive_odbc.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Oct 23 11:34:12 2013
New Revision: 401577

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=401577
Log:
cdr_adaptive_odbc: Also apply a filter when the CDR value is empty.

Extra CDR records are written if a filtered CDR value is empty because the
filter is not checked.

(closes issue ASTERISK-22272)
Reported by: Jordi Llull Chavarria

Modified:
    branches/1.8/cdr/cdr_adaptive_odbc.c

Modified: branches/1.8/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cdr/cdr_adaptive_odbc.c?view=diff&rev=401577&r1=401576&r2=401577
==============================================================================
--- branches/1.8/cdr/cdr_adaptive_odbc.c (original)
+++ branches/1.8/cdr/cdr_adaptive_odbc.c Wed Oct 23 11:34:12 2013
@@ -683,6 +683,11 @@
 					continue;
 				}
 				first = 0;
+			} else if (entry->filtervalue && entry->filtervalue[0] != '\0') {
+				ast_verb(4, "CDR column '%s' was not set and does not match filter of"
+					" '%s'.  Cancelling this CDR.\n",
+					entry->cdrname, entry->filtervalue);
+				goto early_release;
 			}
 		}