From 26606e071afad1faefa2534e80e58466653abe49 Mon Sep 17 00:00:00 2001 From: "Yomi (baphled boodah) Akindayini" Date: Wed, 10 Dec 2008 17:29:57 +0000 Subject: [PATCH] More housekeeping. --- twitterl.erl | 1 + twitterl_interface.erl | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/twitterl.erl b/twitterl.erl index 6e0163f..a481a0d 100644 --- a/twitterl.erl +++ b/twitterl.erl @@ -96,6 +96,7 @@ handle_call({Client, Method, Args}, _From, State) -> handle_call(_, _From, State) -> {noreply, ok, State}. terminate(_Reason, State) -> + io:format("Shutting down...~n"), {ok,State}. code_change(_OldVsn, State, _Extra) -> diff --git a/twitterl_interface.erl b/twitterl_interface.erl index 2da2801..d2b796f 100644 --- a/twitterl_interface.erl +++ b/twitterl_interface.erl @@ -62,7 +62,7 @@ trends() -> parse_json(?SearchTrendsUrl). parse_json(Url) -> - case request_url(Url, nil, nil) of + case request_url(get, Url, nil, nil) of {ok,Body} -> Json = json_parser:dvm_parser(list_to_binary(Body)), {ok,{struct,Reply},_} = Json, @@ -150,7 +150,7 @@ public_timeline() -> %% Checks to see if the user can actually log in. auth_user(Login, Password) -> - case request_url(?VerifyUrl, Login, Password) of + case request_url(get,?VerifyUrl, Login, Password) of {ok,Body} -> case Body of "true" -> true; @@ -216,7 +216,7 @@ get_xml(Url) -> get_xml(Url, nil, nil). %% Get the actual XML response. get_xml(Url,Login,Password) -> - case request_url(Url,Login,Password) of + case request_url(get,Url,Login,Password) of {ok, Body} -> {ok, get_body(Body)}; {error, Error} -> @@ -318,10 +318,10 @@ format_text(Xml, [Xpath | Tail], Result) -> format_text(Xml, Tail, Results). %% Make a request to an URL. -request_url(Url,nil,nil) -> +request_url(get,Url,nil,nil) -> check_response(http:request(get, {Url, headers(nil, nil)}, [], [])); %% Make an authenticated request to the specified URL. -request_url(Url, Login, Pass) -> +request_url(get,Url, Login, Pass) -> check_response(http:request(get, {Url, headers(Login, Pass)}, [], [])). %% Checks out HTTP response, if we get a 200 retrieve