From 40d28960b17bfe6b09fabdcfc0555c9db9cd5971 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 14 Oct 2010 11:05:09 +0200
Subject: fixed errors

---
 client/client.erl | 72 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 22 deletions(-)

(limited to 'client/client.erl')

diff --git a/client/client.erl b/client/client.erl
index 67be4ee..aab0b4e 100644
--- a/client/client.erl
+++ b/client/client.erl
@@ -1,5 +1,5 @@
 -module(client).
--export([register/3, login/3, list/0, handle/2]).
+-export([register/3, login/3, list/0, handle/2, getVotes/0, vote/2, devote/2]).
 
 contains([], _) ->
     false;
@@ -67,6 +67,33 @@ handle(list, Server) ->
     	    {Msg, Server}
     end;
 
+handle(get_votes, Server) ->
+    Server ! get_votes,
+    receive
+    	{ok, Msg} ->
+    	    {Msg, Server};
+    	Msg ->
+    	    {Msg, Server}
+    end;
+
+handle({vote, Artist, Title}, Server) ->
+    Server ! {vote, Artist, Title},
+    receive
+    	{ok, Msg} ->
+    	    {Msg, Server};
+    	Msg ->
+    	    {Msg, Server}
+    end;
+
+handle({devote, Artist, Title}, Server) ->
+    Server ! {vote, Artist, Title},
+    receive
+    	{ok, Msg} ->
+    	    {Msg, Server};
+    	Msg ->
+    	    {Msg, Server}
+    end;
+
 handle({change_state, NewState}, _) ->
     {{ok}, NewState};
 
@@ -74,31 +101,32 @@ handle(Cmd, Server) ->
     {{error, {unknown_command, Cmd}}, Server}.
 
 %queries the server for the current votes this client possesses
-getVotes(Server) ->
-	rpc(Server, getVotes, self()),
-	receive
-		Msg ->
-			Msg
-	end.
+getVotes() ->
+    try checkLogin(true) of
+	_ ->
+	    server:rpc(cli, get_votes)
+    catch
+	{error, login_state} ->
+	    {error, not_logged_in}
+    end.
 
 %positive vote, increments the votes for {Artist, Title} by one
 vote(Artist, Title) ->
-	rpc(Server, vote, [Artist, Title]),
-	receive
-		{_, ok, Msg} ->
-			Msg;
-		{_, error, Msg} ->
-			{error, Msg}
-	end.
+    try checkLogin(true) of
+	_ ->
+	    server:rpc(cli, {vote, Artist, Title})
+    catch
+	{error, login_state} ->
+	    {error, not_logged_in}
+    end.
 
 %negative vote, decrements the votes for {Artist, Title} by one
 devote(Artist, Title) ->
-	rpc(Server, devote, [Artist, Title]),
-	receive
-		{_, ok, Msg} ->
-			Msg;
-		{_, error, Msg} ->
-			{error, Msg}
-	end.
-
+    try checkLogin(true) of
+	_ ->
+	    server:rpc(cli, {devote, Artist, Title})
+    catch
+	{error, login_state} ->
+	    {error, not_logged_in}
+    end.
 
-- 
cgit v1.2.3


From 0b05c03224e9abd367597ba09aa291083a466a7b Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 14 Oct 2010 11:30:22 +0200
Subject: removed code duplication

---
 client/client.erl | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

(limited to 'client/client.erl')

diff --git a/client/client.erl b/client/client.erl
index aab0b4e..ec44401 100644
--- a/client/client.erl
+++ b/client/client.erl
@@ -58,41 +58,23 @@ list() ->
 	    {error, not_logged_in}
     end.
 
-handle(list, Server) ->
-    Server ! list,
+send_to_server(Cmd, Server) ->
+    Server ! cmd,
     receive
     	{ok, Msg} ->
     	    {Msg, Server};
     	Msg ->
     	    {Msg, Server}
-    end;
+    end.
 
+handle(list, Server) ->
+    send_to_server(list, Server);
 handle(get_votes, Server) ->
-    Server ! get_votes,
-    receive
-    	{ok, Msg} ->
-    	    {Msg, Server};
-    	Msg ->
-    	    {Msg, Server}
-    end;
-
+    send_to_server(get_votes, Server);
 handle({vote, Artist, Title}, Server) ->
-    Server ! {vote, Artist, Title},
-    receive
-    	{ok, Msg} ->
-    	    {Msg, Server};
-    	Msg ->
-    	    {Msg, Server}
-    end;
-
+    send_to_server({vote, Artist, Title}, Server);
 handle({devote, Artist, Title}, Server) ->
-    Server ! {vote, Artist, Title},
-    receive
-    	{ok, Msg} ->
-    	    {Msg, Server};
-    	Msg ->
-    	    {Msg, Server}
-    end;
+    send_to_server({devote, Artist, Title}, Server);
 
 handle({change_state, NewState}, _) ->
     {{ok}, NewState};
-- 
cgit v1.2.3


From 8bd7f77de295d1d89edb95d6f9f869f1fedfdffc Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 14 Oct 2010 11:37:55 +0200
Subject: fixed typo

---
 client/client.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'client/client.erl')

diff --git a/client/client.erl b/client/client.erl
index ec44401..46ef59f 100644
--- a/client/client.erl
+++ b/client/client.erl
@@ -59,7 +59,7 @@ list() ->
     end.
 
 send_to_server(Cmd, Server) ->
-    Server ! cmd,
+    Server ! Cmd,
     receive
     	{ok, Msg} ->
     	    {Msg, Server};
-- 
cgit v1.2.3