[asterisk-commits] rmudgett: branch 1.8 r350571 - in /branches/1.8: cel/ configs/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jan 13 11:23:57 2012
New Revision: 350571

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=350571
Log:
Use compatible names for event extra data for various CEL backends.

* Change eventextra to extra in cel_psql.c and cel_odbc.c.

* Change EventExtra to Extra in cel_manager.c.

(issue ASTERISK-17190)

Modified:
    branches/1.8/cel/cel_manager.c
    branches/1.8/cel/cel_odbc.c
    branches/1.8/cel/cel_pgsql.c
    branches/1.8/configs/cel_odbc.conf.sample
    branches/1.8/configs/cel_pgsql.conf.sample

Modified: branches/1.8/cel/cel_manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cel/cel_manager.c?view=diff&rev=350571&r1=350570&r2=350571
==============================================================================
--- branches/1.8/cel/cel_manager.c (original)
+++ branches/1.8/cel/cel_manager.c Fri Jan 13 11:23:57 2012
@@ -92,7 +92,7 @@
 		"Userfield: %s\r\n"
 		"Peer: %s\r\n"
 		"PeerAccount: %s\r\n"
-		"EventExtra: %s\r\n",
+		"Extra: %s\r\n",
 		record.event_name,
 		record.account_code,
 		record.caller_id_num,

Modified: branches/1.8/cel/cel_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cel/cel_odbc.c?view=diff&rev=350571&r1=350570&r2=350571
==============================================================================
--- branches/1.8/cel/cel_odbc.c (original)
+++ branches/1.8/cel/cel_odbc.c Fri Jan 13 11:23:57 2012
@@ -438,7 +438,7 @@
 					ast_copy_string(colbuf, record.peer, sizeof(colbuf));
 				} else if (strcmp(entry->celname, "amaflags") == 0) {
 					snprintf(colbuf, sizeof(colbuf), "%d", record.amaflag);
-				} else if (strcmp(entry->celname, "eventextra") == 0) {
+				} else if (strcmp(entry->celname, "extra") == 0) {
 					ast_copy_string(colbuf, record.extra, sizeof(colbuf));
 				} else {
 					colbuf[0] = 0;

Modified: branches/1.8/cel/cel_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/cel/cel_pgsql.c?view=diff&rev=350571&r1=350570&r2=350571
==============================================================================
--- branches/1.8/cel/cel_pgsql.c (original)
+++ branches/1.8/cel/cel_pgsql.c Fri Jan 13 11:23:57 2012
@@ -234,7 +234,7 @@
 					value = record.user_field;
 				} else if (strcmp(cur->name, "peer") == 0) {
 					value = record.peer;
-				} else if (strcmp(cur->name, "eventextra") == 0) {
+				} else if (strcmp(cur->name, "extra") == 0) {
 					value = record.extra;
 				} else {
 					value = NULL;

Modified: branches/1.8/configs/cel_odbc.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/cel_odbc.conf.sample?view=diff&rev=350571&r1=350570&r2=350571
==============================================================================
--- branches/1.8/configs/cel_odbc.conf.sample (original)
+++ branches/1.8/configs/cel_odbc.conf.sample Fri Jan 13 11:23:57 2012
@@ -47,7 +47,6 @@
 ;	  CEL_FORWARD = 25
 ;	eventtime  (timeval, includes microseconds)
 ;	userdeftype (set only if eventtype == USER_DEFINED)
-;	eventextra
 ;	cid_name
 ;	cid_num
 ;	cid_ani
@@ -65,6 +64,7 @@
 ;	amaflags  (an int)
 ;	userfield
 ;	peer
+;	extra
 
 ; The point of this module is to allow you log whatever you like in terms of the
 ; CEL variables.  Do you want to log uniqueid?  Then simply ensure that your

Modified: branches/1.8/configs/cel_pgsql.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/cel_pgsql.conf.sample?view=diff&rev=350571&r1=350570&r2=350571
==============================================================================
--- branches/1.8/configs/cel_pgsql.conf.sample (original)
+++ branches/1.8/configs/cel_pgsql.conf.sample Fri Jan 13 11:23:57 2012
@@ -34,7 +34,6 @@
 ;	  CEL_FORWARD = 25
 ;	eventtime  (timeval, includes microseconds)
 ;	userdeftype (set only if eventtype == USER_DEFINED)
-;	eventextra
 ;	cid_name
 ;	cid_num
 ;	cid_ani
@@ -52,6 +51,7 @@
 ;	amaflags  (an int)
 ;	userfield
 ;	peer
+;	extra
 
 
 [global]