Author: bdonlan
Date: 2005-12-09 15:52:40 -0500 (Fri, 09 Dec 2005)
New Revision: 945
Modified:
trunk/erlang/server/server.erl
Log:
fix a few bugs
Modified: trunk/erlang/server/server.erl
===================================================================
--- trunk/erlang/server/server.erl 2005-12-09 20:34:01 UTC (rev 944)
+++ trunk/erlang/server/server.erl 2005-12-09 20:52:40 UTC (rev 945)
@@ -130,7 +130,7 @@
peer_proc(Buf, Pid) ->
io:format("peer_proc ~p~n", [Buf]),
- case lists:partition(fun(C) -> not ((C == $\r) or (C == $\n)) end, Buf) of
+ case lists:splitwith(fun(C) -> not ((C == $\r) or (C == $\n)) end, Buf) of
{ _, [] } -> Buf;
{ L, Rem} ->
Pid ! {line, line_encode:decode(L) },
@@ -154,7 +154,6 @@
gen_tcp:close(Socket),
exit(rude_peer);
Foo -> io:format("haver_entry unknown msg ~p~n", [Foo])
-
end.
handle_ident(Uid) ->
@@ -330,12 +329,12 @@
J.channel = Channel
] end,
case mnemosyne:eval(Q) of
- [] -> mnesis:abort(notjoined);
+ [] -> notjoined;
_ -> ok
end end,
R = mnesia:transaction(T),
case R of
- { aborted, notjoined } ->
+ { atomic, notjoined } ->
haver_sendline(["FAIL", "IN", "not.joined", Channel]);
{ atomic, ok } ->
chan_broadcast(Channel, { sendline, ["IN", Channel, Uid | Message]
})
@@ -371,8 +370,8 @@
{ line, [ "POKE" | L ] } -> haver_sendline(["OUCH" | L]);
{ line, ["DIE"]} ->
[] = [1]; % XXX
- { line, [ L | _ ] } ->
- io:format("unmatched line: ~p~n", L),
+ { line, [ L | T ] } ->
+ io:format("unmatched line: ~p~n", [L|T]),
haver_sendline(["FAIL", L, "unknown.cmd"]),
ok;
{ line, L } ->
