make GROUP set group@categroy instead of category@group
authorRussell Bryant <russell@russellbryant.com>
Thu, 28 Jul 2005 21:16:02 +0000 (21:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 28 Jul 2005 21:16:02 +0000 (21:16 +0000)
ensure that GROUP_COUNT still returns "0", even if no group was found

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6245 65c4cc65-6c06-0410-ace0-fbb531ad65f3

funcs/func_groupcount.c

index 66a7367..54e6e10 100755 (executable)
@@ -36,7 +36,7 @@ static char *group_count_function_read(struct ast_channel *chan, char *cmd, char
                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 @@ static void group_function_write(struct ast_channel *chan, char *cmd, char *data
        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));
        }