* src/ejd2odbc.erl: Bugfix

SVN Revision: 698

diff --git a/ChangeLog b/ChangeLog
index 2ae77e89a19e679e371621aba62eacdedf5bd8dd..5971cf34f35b1cc2bf2b65dce5f49b832ceab8e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-21  Alexey Shchepin  <alexey@sevcom.net>
+
+       * src/ejd2odbc.erl: Bugfix
+
 2006-12-16  Mickael Remond  <mickael.remond@process-one.net>
 
        * README: Added this file as a quickstart guide.
@@ -67,7 +71,7 @@
 
        * doc/guide.tex: Fixed regexp ACL configuration examples
        (Thanks to Massimiliano Mirra).
-       
+
        * src/muc/mod_muc_room.erl: API improvement. It is now possible
        to read and write a room config from a developer module (Thanks
        to Massimiliano Mirra).

diff --git a/src/ejd2odbc.erl b/src/ejd2odbc.erl
index 6dfc3a406bcb753a0c43a1630a3652ea7c75138c..1513a1abc05cee6ce96c3e4591c5303116af9e94 100644 (file)
--- a/src/ejd2odbc.erl
+++ b/src/ejd2odbc.erl
@@ -229,17 +229,18 @@ export_vcard_search(Server, Output) ->
 
 export_private_storage(Server, Output) ->
     export_common(
-        Server, private_storage, Output,
-        fun(Host, #private_storage{usns = {LUser, LServer, XMLNS},
-                              xml = Data})
-         when LServer == Host ->
-             Username = ejabberd_odbc:escape(LUser),
+      Server, private_storage, Output,
+      fun(Host, #private_storage{usns = {LUser, LServer, XMLNS},
+                                xml = Data})
+        when LServer == Host ->
+             Username = ejabberd_odbc:escape(LUser),
              LXMLNS = ejabberd_odbc:escape(XMLNS),
-             SData = ejabberd_odbc:escape(Data),
+             SData = ejabberd_odbc:escape(
+                       lists:flatten(xml:element_to_string(Data))),
              odbc_queries:set_private_data_sql(Username, LXMLNS, SData);
-          (_Host, _R) ->
+        (_Host, _R) ->
              []
-    end).
+      end).
 
 %%%----------------------------------------------------------------------
 %%% Internal functions