From 2966ca288c2d0b97199c09f37e8d3f8cb6b94638 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 23 Oct 2013 16:52:11 +0000
Subject: [PATCH] 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
........
Merged revisions 401577 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 401579 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 401581 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
cdr/cdr_adaptive_odbc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index a590fb32a1..0a9cfdbdd9 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -720,6 +720,14 @@ static int odbc_log(struct ast_cdr *cdr)
continue;
}
first = 0;
+ } else if (entry->filtervalue
+ && ((!entry->negatefiltervalue && entry->filtervalue[0] != '\0')
+ || (entry->negatefiltervalue && entry->filtervalue[0] == '\0'))) {
+ ast_verb(4, "CDR column '%s' was not set and does not match filter of"
+ " %s'%s'. Cancelling this CDR.\n",
+ entry->cdrname, entry->negatefiltervalue ? "!" : "",
+ entry->filtervalue);
+ goto early_release;
}
}
--
GitLab