ejabberd - Comments for "ejabberdctl srg_create with optional name, description and display arguments"

Committed

mfoss — Mon, 28 Dec 2009 11:48:36 +0000

Quote:

This patch solves it, please verify before I commit them

I've committed the patch to SVN.

Patch committed

mfoss — Mon, 28 Dec 2009 11:47:00 +0000

Quote:

If you don't find any problem with that patch, it will be applied to ejabberd.

I've committed the patch to ejabberd SVN 2.1.x branch and trunk.

In Erlang, "" is another way

mfoss — Fri, 18 Dec 2009 12:32:21 +0000

In Erlang, "" is another way to represent the same that []. So that isn't a problem.

The real problem is [[]]. This patch solves it, please verify before I commit them:

--- src/mod_admin_extra.erl     (revisión: 1041)
+++ src/mod_admin_extra.erl     (copia de trabajo)
@@ -1017,7 +1017,10 @@
 %%%

 srg_create(Group, Host, Name, Description, Display) ->
-    {ok, DisplayList} = regexp:split(Display, "\\\\n"),
+    {ok, DisplayList} = case Display of
+       [] -> {ok, []};
+       _ -> regexp:split(Display, "\\\\n")
+    end,
     Opts = [{name, Name},
            {displayed_groups, DisplayList},
            {description, Description}],

My apologies. The patch

amaramrahul — Wed, 16 Dec 2009 11:18:35 +0000

My apologies. The patch actually doesn't do what is required. It seems to create empty lists. The below output should make this clear:

$ ejabberdctl srg_create group1 example.net "" "" ""
$ ejabberdctl srg_get_info group1 example.net
name []
displayed_groups [[]]
description []

where as the expected output should be:
$ ejabberdctl srg_get_info group1 example.net
name ""
displayed_groups []
description ""

I think this is only a minor problem. Could it be fixed?

Though the patch did not

amaramrahul — Tue, 15 Dec 2009 06:19:01 +0000

Though the patch did not apply perfectly, the code seems to be working flawlessly. Also I have observed that trailing backslashes should not be used to leave the fields empty. So the correct commands would be:

$ ejabberdctl srg_create noname localhost "" mydesc mydisp
$ ejabberdctl srg_create nodisplay localhost myname mydesc ""

Using single quotes as below also worked:

$ ejabberdctl srg_create noname localhost '' mydesc mydisp
$ ejabberdctl srg_create nodisplay localhost myname mydesc ''

Try to apply this patch to

mfoss — Mon, 14 Dec 2009 18:17:53 +0000

Try to apply this patch to ejabberd:

--- src/ejabberd_ctl.erl
+++ src/ejabberd_ctl.erl
@@ -318,18 +318,19 @@ format_args(Args, ArgsFormat) ->
       [],
       lists:zip(ArgsFormat, Args)).

-format_arg(Arg, Format) ->
-    Parse = case Format of
-               integer ->
-                   "~d";
-               string ->
-                   NumChars = integer_to_list(string:len(Arg)),
-                   "~" ++ NumChars ++ "c"
-           end,
+format_arg(Arg, integer) ->
+    format_arg2(Arg, "~d");
+format_arg("", string) ->
+    "";
+format_arg(Arg, string) ->
+    NumChars = integer_to_list(string:len(Arg)),
+    Parse = "~" ++ NumChars ++ "c",
+    format_arg2(Arg, Parse).
+
+format_arg2(Arg, Parse)->
     {ok, [Arg2], _RemainingArguments} = io_lib:fread(Parse, Arg),
     Arg2.

-
 %%-----------------------------
 %% Format result
 %%-----------------------------

Now you can do things like:

$ ejabberdctl srg_create noname localhost \"\" mydesc mydisp
$ ejabberdctl srg_create nodisplay localhost myname mydesc \"\"

If you don't find any problem with that patch, it will be applied to ejabberd.