Fix decompressing of custom elements with custom namespace

diff --git a/src/xml_compress.erl b/src/xml_compress.erl
index 673b25c148e74ea92176d3df5479d1cc411a7830..a85ec56b2663f13618f3c02e409c0cef7c409927 100644 (file)
--- a/src/xml_compress.erl
+++ b/src/xml_compress.erl
@@ -506,8 +506,8 @@ decode_child(<<2:8, Rest/binary>>, PNs, J1, J2) ->
   {Children, Rest4} = decode_children(Rest3, PNs, J1, J2),
   {{xmlel, Name, Attrs, Children}, Rest4};
 decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) ->
-  {Name, Rest2} = decode_string(Rest),
-  {Ns, Rest3} = decode_string(Rest2),
+  {Ns, Rest2} = decode_string(Rest),
+  {Name, Rest3} = decode_string(Rest2),
   {Attrs, Rest4} = decode_attrs(Rest3),
   {Children, Rest5} = decode_children(Rest4, Ns, J1, J2),
   {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5};

diff --git a/tools/xml_compress_gen.erl b/tools/xml_compress_gen.erl
index 4dad71a4321aeca61fec8fb4fb3e2b3411cb1a44..592c9240c0e300d12338e336c82ec6fe6417f014 100644 (file)
--- a/tools/xml_compress_gen.erl
+++ b/tools/xml_compress_gen.erl
@@ -117,8 +117,8 @@ gen_decode(Dev, Data, VerId) ->
                   "  {Children, Rest4} = decode_children(Rest3, PNs, J1, J2),~n"
                   "  {{xmlel, Name, Attrs, Children}, Rest4};~n", []),
     io:format(Dev, "decode_child(<<3:8, Rest/binary>>, PNs, J1, J2) ->~n"
-                  "  {Name, Rest2} = decode_string(Rest),~n"
-                  "  {Ns, Rest3} = decode_string(Rest2),~n"
+                  "  {Ns, Rest2} = decode_string(Rest),~n"
+                  "  {Name, Rest3} = decode_string(Rest2),~n"
                   "  {Attrs, Rest4} = decode_attrs(Rest3),~n"
                   "  {Children, Rest5} = decode_children(Rest4, Ns, J1, J2),~n"
                   "  {{xmlel, Name, add_ns(PNs, Ns, Attrs), Children}, Rest5};~n", []),