[asterisk-commits] murf: branch group/newcdr r116349 - in /team/group/newcdr: cel/ main/

[SVN commits to the Asterisk project]

Author: murf
Date: Wed May 14 12:57:22 2008
New Revision: 116349

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116349
Log:
Fix some errors-- things are showing up in the dbs, no hangs, looks ok now

Modified:
    team/group/newcdr/cel/cel_custom.c
    team/group/newcdr/cel/cel_manager.c
    team/group/newcdr/main/cel.c

Modified: team/group/newcdr/cel/cel_custom.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/cel/cel_custom.c?view=diff&rev=116349&r1=116348&r2=116349
==============================================================================
--- team/group/newcdr/cel/cel_custom.c (original)
+++ team/group/newcdr/cel/cel_custom.c Wed May 14 12:57:22 2008
@@ -73,7 +73,7 @@
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 	int res = -1;
 
-	if ((cfg = ast_config_load("cdr_custom.conf", config_flags)) == CONFIG_STATUS_FILEUNCHANGED)
+	if ((cfg = ast_config_load("cel_custom.conf", config_flags)) == CONFIG_STATUS_FILEUNCHANGED)
 		return 0;
 	
 	strcpy(format, "");
@@ -154,6 +154,7 @@
 	userfield = ast_event_get_ie_str(event, AST_EVENT_IE_CEL_USERFIELD);
 	peer = ast_event_get_ie_str(event, AST_EVENT_IE_CEL_PEER);
 
+	/* fill in all the fields of the dummy channel tchan */
 	cel_set_backend_channel_vars(&tchan, eventtype, userdefname, eventtime, cid_name, cid_num, 
 								 cid_ani, cid_rdnis, cid_dnid, exten, context, channame, 
 								 appname, appdata, accountcode, uniqueid, amaflag, userfield, peer, linkedid);
@@ -161,6 +162,7 @@
 	memset(buf, 0 , sizeof(buf));
 	/* Quite possibly the first use of a static struct ast_channel, we need it so the var funcs will work */
 	/* fix this code */
+	
 	pbx_substitute_variables_helper(&tchan, format, buf, sizeof(buf) - 1);
 
 	/* get rid of the headp list, it's function is done */

Modified: team/group/newcdr/cel/cel_manager.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/cel/cel_manager.c?view=diff&rev=116349&r1=116348&r2=116349
==============================================================================
--- team/group/newcdr/cel/cel_manager.c (original)
+++ team/group/newcdr/cel/cel_manager.c Wed May 14 12:57:22 2008
@@ -107,9 +107,6 @@
 				}
 			}
 		}
-	
-		/* Next category */
-		cat = ast_category_browse(cfg, cat);
 	}
 	
 	ast_config_destroy(cfg);

Modified: team/group/newcdr/main/cel.c
URL: http://svn.digium.com/view/asterisk/team/group/newcdr/main/cel.c?view=diff&rev=116349&r1=116348&r2=116349
==============================================================================
--- team/group/newcdr/main/cel.c (original)
+++ team/group/newcdr/main/cel.c Wed May 14 12:57:22 2008
@@ -638,6 +638,7 @@
 							   AST_EVENT_IE_CEL_AMAFLAGS, AST_EVENT_IE_PLTYPE_UINT, chan->amaflags,
 							   AST_EVENT_IE_CEL_ACCTCODE, AST_EVENT_IE_PLTYPE_STR, chan->accountcode,
 							   AST_EVENT_IE_CEL_UNIQUEID, AST_EVENT_IE_PLTYPE_STR, chan->uniqueid,
+							   AST_EVENT_IE_CEL_LINKEDID, AST_EVENT_IE_PLTYPE_STR, chan->linkedid,
 							   AST_EVENT_IE_CEL_USERFIELD, AST_EVENT_IE_PLTYPE_STR, chan->userfield,
 							   AST_EVENT_IE_CEL_PEER, AST_EVENT_IE_PLTYPE_STR, peername,
 							   AST_EVENT_IE_END);