jdb/timestamper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed extended data handling in `ts_json` module.

Browse Source 
* Refactored ``ts_json:ext_data_to_ejson{1,2}`` from a function that iterates
  over a list of extended data properties and returns a transformed list to
  ``ts_json:ext_data_to_ejson/1``, a function that transforms one extended data
  property. The iteration behavior is acheived using ``lists:map/2``.
* Refactored ``ts_json:ejson_to_ext_data{1,2}`` in a similar fashion to
  ``ts_json:ext_data_to_ejson{1,2}``.
* Fixed ``ts_json:construct_record/3`` to use ``ts_json:ejson_to_ext_data/1``.
This commit is contained in:
Jonathan Bernard 2011-06-15 00:26:31 -05:00
parent 8bb50c058d
commit 7d11112226
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/ts_json.erl
View File

@ -19,7 +19,7 @@ record_to_ejson(Record=#ts_user{}, ExtData) ->
{name, Record#ts_user.name}, {name, Record#ts_user.name},
{email, Record#ts_user.email}, {email, Record#ts_user.email},
{join_date, encode_datetime(Record#ts_user.join_date)}] ++ {join_date, encode_datetime(Record#ts_user.join_date)}] ++
ext_data_to_ejson(ExtData)}; lists:map(fun ext_data_to_ejson/1, ExtData)};
% Timeline JSON record stucture: % Timeline JSON record stucture:
% {"user_id": "john_doe", % {"user_id": "john_doe",
@ -37,7 +37,7 @@ record_to_ejson(Record=#ts_timeline{}, ExtData) ->
{id, TimelineId}, {id, TimelineId},
{created, encode_datetime(Record#ts_timeline.created)}, {created, encode_datetime(Record#ts_timeline.created)},
{description, Record#ts_timeline.desc}] ++ {description, Record#ts_timeline.desc}] ++
ext_data_to_ejson(ExtData)}; lists:map(fun ext_data_to_ejson/1, ExtData)};
% Entry JSON record structure: % Entry JSON record structure:
% {"user_id": "john_doe", % {"user_id": "john_doe",
@ -62,20 +62,16 @@ record_to_ejson(Record=#ts_entry{}, ExtData) ->
{timestamp, encode_datetime(DateTime)}, {timestamp, encode_datetime(DateTime)},
{mark, Record#ts_entry.mark}, {mark, Record#ts_entry.mark},
{notes, Record#ts_entry.notes}] ++ {notes, Record#ts_entry.notes}] ++
ext_data_to_ejson(ExtData)}. lists:map(fun ext_data_to_ejson/1, ExtData)}.
encode_datetime({{Year, Month, Day}, {Hour, Minute, Second}}) -> encode_datetime({{Year, Month, Day}, {Hour, Minute, Second}}) ->
lists:flatten(io_lib:format("~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~2.10.0B.~3.10.0BZ", lists:flatten(io_lib:format("~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~2.10.0B.~3.10.0BZ",
[Year, Month, Day, Hour, Minute, Second, 000])). [Year, Month, Day, Hour, Minute, Second, 000])).
ext_data_to_ejson(ExtData) -> ext_data_to_ejson(ExtData, []). ext_data_to_ejson({Key, Value}) ->
ext_data_to_ejson([], ExtData) -> ExtData;
ext_data_to_ejson([{Key, Value}|T], Acc) ->
case Key of case Key of
entry_exclusions -> ext_data_to_ejson(T, [{Key, {array, Value}}|Acc]); entry_exclusions -> {Key, {array, Value}};
_Other -> ext_data_to_json(T, [{Key, Value}|Acc]) _Other -> {Key, Value}
end. end.
ejson_to_record(Empty, {struct, EJSONFields}) -> ejson_to_record(Empty, {struct, EJSONFields}) ->
@ -118,7 +114,9 @@ construct_record(Timeline=#ts_timeline{}, [{Key, Val}|Fields], ExtData) ->
Fields, ExtData); Fields, ExtData);
description -> construct_record(Timeline#ts_timeline{desc = Value}, description -> construct_record(Timeline#ts_timeline{desc = Value},
Fields, ExtData); Fields, ExtData);
Other -> construct_record(Timeline, Fields, [{Key, Value}|ExtData]) Other ->
ExtDataProp = ejson_to_ext_data({Key, Value}),
construct_record(Timeline, Fields, [ExtDataProp|ExtData])
end; end;
construct_record(Entry=#ts_entry{}, [{Key, Value}|Fields], ExtData) -> construct_record(Entry=#ts_entry{}, [{Key, Value}|Fields], ExtData) ->
@ -129,7 +127,9 @@ construct_record(Entry=#ts_entry{}, [{Key, Value}|Fields], ExtData) ->
Fields, ExtData); Fields, ExtData);
mark -> construct_record(Entry#ts_entry{mark=Value}, Fields, ExtData); mark -> construct_record(Entry#ts_entry{mark=Value}, Fields, ExtData);
notes -> construct_record(Entry#ts_entry{notes=Vale}, Fields, ExtData); notes -> construct_record(Entry#ts_entry{notes=Vale}, Fields, ExtData);
Other -> construct_record(Entry, Fields, [{Key, Value}|ExtData]) Other ->
ExtDataProp = ejson_to_ext_data({Key, Value}),
construct_record(Entry, Fields, [ExtDataProp|ExtData])
end; end;
construct_record(Record, [], ExtData) -> {Record, ExtData}. construct_record(Record, [], ExtData) -> {Record, ExtData}.
@ -157,14 +157,12 @@ decode_datetime(DateTimeString) ->
{Date, Time}. {Date, Time}.
ejson_to_ext_data(ExtData) -> ejson_to_ext_data(ExtData, []). ejson_to_ext_data({Key, Value}) ->
ejson_to_ext_data([], ExtData) -> ExtData;
ejson_to_ext_data([{Key, Value}|T], Acc) ->
case Key of case Key of
entry_exclusions -> ext_data_to_ejson(T, [{Key, element(2, Value)}|Acc]); entry_exclusions ->
_Other -> ext_data_to_json(T, [{Key, Value}|Acc]) {array, ExclList} = Value,
{Key, ExclList};
_Other -> {Key, Value}
end. end.