[Asterisk-cvs] asterisk/funcs func_groupcount.c,1.5,1.6

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/funcs
In directory mongoose.digium.com:/tmp/cvs-serv5595/funcs

Modified Files:
	func_groupcount.c 
Log Message:
make GROUP set group at categroy instead of category at group
ensure that GROUP_COUNT still returns "0", even if no group was found


Index: func_groupcount.c
===================================================================
RCS file: /usr/cvsroot/asterisk/funcs/func_groupcount.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- func_groupcount.c	27 Jul 2005 22:43:18 -0000	1.5
+++ func_groupcount.c	28 Jul 2005 21:16:02 -0000	1.6
@@ -36,7 +36,7 @@
 		if ((grp = pbx_builtin_getvar_helper(chan, category)))
 			ast_copy_string(group, grp, sizeof(group));
 		else
-			return buf;
+			ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name);	
 	}
 
 	count = ast_app_group_get_count(group, category);
@@ -109,7 +109,7 @@
 	char grpcat[256];
 
 	if (data && !ast_strlen_zero(data)) {
-		snprintf(grpcat, sizeof(grpcat), "%s@%s", data, value);
+		snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data);
 	} else {
 		ast_copy_string(grpcat, value, sizeof(grpcat));
 	}