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

diff --git a/CHANGES b/CHANGES
index 0a1e361fbd8a0da8a81bb004ee3eb5e553307fd8..a801208d62a43feb0ee8e8f01b257da786dfebd9 100644 (file)
--- 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 e7aa034420c6566a3669c88312f087873eaf46b2..8554ac25f9de0a820ac90c5242fb2feb582d9871 100644 (file)
--- 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 c1861c8553527804c8a00c7b719b616df55883d4..62438d8567d44ce2879b8b2aa049a3159adb10a3 100644 (file)
--- 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 75882118a3c00608a24416ae109c3d3cf12c95e0..67d0574ab5029768882f536c5a1896a519ff7a36 100644 (file)
--- 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