From 2dfb427540da8f4d10f7979500d108fe19ab3dc7 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 5 May 2011 23:08:05 +0000
Subject: [PATCH] Add CEL extra field to cel_pgsql.

(closes issue #18462)
Reported by: joscas
Patches:
      bug_18462.diff uploaded by snuffy (license 35)
      cel_pgsql.conf.sample.issue18462.patch uploaded by joscas (license 1180)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 CHANGES                       | 5 +++++
 UPGRADE.txt                   | 4 ++++
 cel/cel_pgsql.c               | 2 ++
 configs/cel_pgsql.conf.sample | 2 +-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 0a1e361fbd..a801208d62 100644
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,11 @@ FollowMe
    compatability for a FollowMe call with certain dialplan apps, options, and
    functions.
 
+CEL
+--------------------------
+ * cel_pgsql now supports the 'extra' column for data added using the
+   CELGenUserEvent() application.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
 ------------------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index e7aa034420..8554ac25f9 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -21,6 +21,10 @@
 
 From 1.8 to 1.10:
 
+cel_pgsql:
+ - This module now expects an 'extra' column in the database for data added
+   using the CELGenUserEvent() application.
+
 ConfBridge
  - ConfBridge's dialplan arguments have changed and are not
    backwards compatible.
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index c1861c8553..62438d8567 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -239,6 +239,8 @@ static void pgsql_log(const struct ast_event *event, void *userdata)
 					value = record.user_field;
 				} else if (strcmp(cur->name, "peer") == 0) {
 					value = record.peer;
+				} else if (strcmp(cur->name, "extra") == 0) {
+					value = record.extra;
 				} else {
 					value = NULL;
 				}
diff --git a/configs/cel_pgsql.conf.sample b/configs/cel_pgsql.conf.sample
index 75882118a3..67d0574ab5 100644
--- a/configs/cel_pgsql.conf.sample
+++ b/configs/cel_pgsql.conf.sample
@@ -51,7 +51,7 @@
 ;	amaflag  (an int)
 ;	userfield
 ;	peer
-
+;	extra
 
 [global]
 ;hostname=localhost
-- 
GitLab