Browse Source

fix compile errors

Andrii Zadorozhnii 12 years ago
parent
commit
59a9c755b5
2 changed files with 5 additions and 3 deletions
  1. 4 2
      src/feed_server_api.erl
  2. 1 1
      src/kvs.erl

+ 4 - 2
src/feed_server_api.erl

@@ -6,6 +6,8 @@
 -include_lib("kvs/include/log.hrl").
 -include_lib("kvs/include/log.hrl").
 -include_lib("feed_server/include/feed_server.hrl").
 -include_lib("feed_server/include/feed_server.hrl").
 
 
+-record(state, {owner = "feed_owner", feed, direct, type, cached_feed,cached_direct,cached_friends,cached_groups }).
+
 handle_notice(["feed", "delete", Owner] = Route, Message,
 handle_notice(["feed", "delete", Owner] = Route, Message,
               #state{owner = Owner} = State) ->
               #state{owner = Owner} = State) ->
     ?INFO("feed(~p): notification received: User=~p, Route=~p, Message=~p",
     ?INFO("feed(~p): notification received: User=~p, Route=~p, Message=~p",
@@ -120,7 +122,7 @@ handle_notice(["feed", "group", _Group, "entry", EntryId, "delete"] = Route,
 
 
 handle_notice(["feed", _Type, EntryOwner, "entry", EntryId, "delete"] = Route,
 handle_notice(["feed", _Type, EntryOwner, "entry", EntryId, "delete"] = Route,
               Message,
               Message,
-              #state{owner = Owner, feed=Feed, direcct=Direct} = State) ->
+              #state{owner = Owner, feed=Feed, direct=Direct} = State) ->
     case {EntryOwner, Message} of
     case {EntryOwner, Message} of
         %% owner of the antry has deleted entry, we will delete it too
         %% owner of the antry has deleted entry, we will delete it too
         {_, [EntryOwner|_]} ->
         {_, [EntryOwner|_]} ->
@@ -132,7 +134,7 @@ handle_notice(["feed", _Type, EntryOwner, "entry", EntryId, "delete"] = Route,
         {Owner, _} ->
         {Owner, _} ->
             ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
             ?INFO("feed(~p): remove entry: Owner=~p, Route=~p, Message=~p",
                   [self(), Owner, Route, Message]),
                   [self(), Owner, Route, Message]),
-            feeds:remove_entry(Feed, EntryId);
+            feeds:remove_entry(Feed, EntryId),
             feeds:remove_entry(Direct, EntryId);
             feeds:remove_entry(Direct, EntryId);
         %% one of the friends has deleted some entry from his feed. Ignore
         %% one of the friends has deleted some entry from his feed. Ignore
         _ ->
         _ ->

+ 1 - 1
src/kvs.erl

@@ -307,7 +307,7 @@ list_to_term(String) ->
     end.
     end.
 
 
 save_db(Path) ->
 save_db(Path) ->
-    Data = lists:append([all(B) || B <- list_buckets()]),
+    Data = lists:append([all(B) || B <- [list_to_term(B) || B <- store_riak:dir()] ]),
     kvs:save(Path, Data).
     kvs:save(Path, Data).
 
 
 load_db(Path) ->
 load_db(Path) ->