From 71e0d7d8e240c3989a0074b49ec0195d090c9f4e Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Thu, 27 Aug 2009 08:26:22 +0000
Subject: [PATCH] port commit from r2527 to odbc plugin

SVN Revision: 2544
---
 src/mod_pubsub/node_hometree.erl      |  2 +-
 src/mod_pubsub/node_hometree_odbc.erl | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/mod_pubsub/node_hometree.erl b/src/mod_pubsub/node_hometree.erl
index 134ee4894..c5ab29367 100644
--- a/src/mod_pubsub/node_hometree.erl
+++ b/src/mod_pubsub/node_hometree.erl
@@ -697,7 +697,7 @@ set_subscriptions(NodeId, Owner, Subscription, SubId) ->
     case {SubId, SubState#pubsub_state.subscriptions} of
 	{_, []} ->
 	    case Subscription of
-		none -> ok;
+		none -> {error, ?ERR_EXTENDED('bad_request', "not-subscribed")};
 		_ -> new_subscription(NodeId, Owner, Subscription, SubState)
 	    end;
 	{"", [{_, SID}]} ->
diff --git a/src/mod_pubsub/node_hometree_odbc.erl b/src/mod_pubsub/node_hometree_odbc.erl
index ebc5943c0..1f0cbaa71 100644
--- a/src/mod_pubsub/node_hometree_odbc.erl
+++ b/src/mod_pubsub/node_hometree_odbc.erl
@@ -741,8 +741,10 @@ set_subscriptions(NodeId, Owner, Subscription, SubId) ->
     SubState = get_state_without_itemids(NodeId, SubKey),
     case {SubId, SubState#pubsub_state.subscriptions} of
 	{_, []} ->
-        %% pablo  TODO, there seems that commit 2528 was applied to mnesia but not ported to odbc 
-        {error, 'item-not-found'};
+	    case Subscription of
+		none -> {error, ?ERR_EXTENDED('bad_request', "not-subscribed")};
+		_ -> new_subscription(NodeId, Owner, Subscription, SubState)
+	    end;
 	{"", [{_, SID}]} ->
 	    case Subscription of
 		none -> unsub_with_subid(NodeId, SID, SubState);
@@ -767,6 +769,16 @@ replace_subscription(_, [], Acc) ->
 replace_subscription({Sub, SubId}, [{_, SubID} | T], Acc) ->
     replace_subscription({Sub, SubId}, T, [{Sub, SubID} | Acc]).
 
+new_subscription(NodeId, Owner, Subscription, SubState) ->
+    case pubsub_subscription_odbc:subscribe_node(Owner, NodeId, []) of
+	{result, SubId} ->
+	    Subscriptions = SubState#pubsub_state.subscriptions,
+	    set_state(SubState#pubsub_state{subscriptions = [{Subscription, SubId} | Subscriptions]}),
+	    {Subscription, SubId};
+	_ ->
+	    {error, 'internal-server-error'}
+    end.
+
 unsub_with_subid(NodeId, SubId, SubState) ->
     pubsub_subscription_odbc:unsubscribe_node(SubState#pubsub_state.stateid,
 					 NodeId, SubId),
@@ -778,6 +790,7 @@ unsub_with_subid(NodeId, SubId, SubState) ->
 	_ ->
 	    set_state(SubState#pubsub_state{subscriptions = NewSubs})
     end.
+
 %% @spec (Host, Owner) -> {result, [Node]} | {error, Reason}
 %%       Host = host()
 %%       Owner = jid()