starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

api: use pattern matching in to_json arguments

This commit is contained in:
Bart Van Der Meerssche 2010-03-14 14:12:35 +00:00
parent 4a5e939acc
commit a53fa50f80
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/api/flukso/src/flukso_resource.erl
View File

@ -34,16 +34,16 @@ malformed_request(ReqData, _) ->
content_types_provided(ReqData, State) -> content_types_provided(ReqData, State) ->
{[{"application/json", to_json}], ReqData, State}. {[{"application/json", to_json}], ReqData, State}.
to_json(ReqData, State) -> to_json(ReqData, #state{rrdSensor = RrdSensor, rrdTime = RrdTime, rrdFactor = RrdFactor} = State) ->
case wrq:path_info(interval, ReqData) of case wrq:path_info(interval, ReqData) of
"night" -> Path = "var/data/night/"; "night" -> Path = "var/data/night/";
_Interval -> Path = "var/data/base/" _Interval -> Path = "var/data/base/"
end, end,
case erlrrd:fetch(erlrrd:c([[Path, [State#state.rrdSensor|".rrd"]], "AVERAGE", ["-s",State#state.rrdTime]])) of case erlrrd:fetch(erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s",RrdTime]])) of
{ok, Response} -> {ok, Response} ->
Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11], Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11],
Datapoints = [[list_to_integer(X), round(list_to_float(Y) * State#state.rrdFactor)] || [X, Y] <- Filtered, string:len(Y) /= 3], Datapoints = [[list_to_integer(X), round(list_to_float(Y) * RrdFactor)] || [X, Y] <- Filtered, string:len(Y) /= 3],
Nans = [[list_to_integer(X), list_to_binary(Y)] || [X, Y] <- Filtered, string:len(Y) == 3], Nans = [[list_to_integer(X), list_to_binary(Y)] || [X, Y] <- Filtered, string:len(Y) == 3],
Final = lists:merge(Datapoints, Nans), Final = lists:merge(Datapoints, Nans),
{mochijson2:encode(Final), ReqData, State}; {mochijson2:encode(Final), ReqData, State};