From 116f142883e3f834941d64605ec378a8bed18fff Mon Sep 17 00:00:00 2001 From: cabol Date: Fri, 5 Aug 2016 08:53:04 -0500 Subject: [PATCH] =?UTF-8?q?Change=20the=20doc=20transforn=20fun=20from=20f?= =?UTF-8?q?un/2=20to=20fun/4=20=E2=80=93=20regarding=20with=20PR=20comment?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/adapters/sumo_store_mnesia.erl | 16 ++++++++-------- src/utils/sumo_utils.erl | 15 +++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/adapters/sumo_store_mnesia.erl b/src/adapters/sumo_store_mnesia.erl index 373fbfe..34d7ec9 100644 --- a/src/adapters/sumo_store_mnesia.erl +++ b/src/adapters/sumo_store_mnesia.erl @@ -349,27 +349,27 @@ validate_date({FieldType, _, FieldValue}) -> %% @private sleep(Doc) -> - sumo_utils:doc_transform(fun sleep_fun/2, Doc). + sumo_utils:doc_transform(fun sleep_fun/4, Doc). %% @private -sleep_fun({_, _, undefined}, _) -> +sleep_fun(_, _, undefined, _) -> undefined; -sleep_fun({string, _, FieldValue}, _) -> +sleep_fun(string, _, FieldValue, _) -> sumo_utils:to_bin(FieldValue); -sleep_fun({date, _, FieldValue}, _) -> +sleep_fun(date, _, FieldValue, _) -> case sumo_utils:is_datetime(FieldValue) of true -> {FieldValue, {0, 0, 0}}; _ -> FieldValue end; -sleep_fun({_, _, FieldValue}, _) -> +sleep_fun(_, _, FieldValue, _) -> FieldValue. %% @private wakeup(Doc) -> - sumo_utils:doc_transform(fun wakeup_fun/2, Doc). + sumo_utils:doc_transform(fun wakeup_fun/4, Doc). %% @private -wakeup_fun({date, _, {Date, _} = _FieldValue}, _) -> +wakeup_fun(date, _, {Date, _} = _FieldValue, _) -> Date; -wakeup_fun({_, _, FieldValue}, _) -> +wakeup_fun(_, _, FieldValue, _) -> FieldValue. diff --git a/src/utils/sumo_utils.erl b/src/utils/sumo_utils.erl index 8349e32..6e522db 100644 --- a/src/utils/sumo_utils.erl +++ b/src/utils/sumo_utils.erl @@ -21,11 +21,14 @@ %%%============================================================================= -spec doc_transform(Fun, Doc1) -> Doc2 when - Fun :: fun((DocSum, Attrs) -> sumo:field_value()), - DocSum :: {sumo:field_type(), sumo:field_name(), sumo:field_value()}, - Attrs :: sumo:field_attrs(), - Doc1 :: sumo_internal:doc(), - Doc2 :: sumo_internal:doc(). + Fun :: fun((FieldType, FieldName, Value1, FieldAttrs) -> Value2), + FieldType :: sumo:field_type(), + FieldName :: sumo:field_name(), + Value1 :: sumo:field_value(), + FieldAttrs :: sumo:field_attrs(), + Value2 :: sumo:field_value(), + Doc1 :: sumo_internal:doc(), + Doc2 :: sumo_internal:doc(). doc_transform(Fun, Doc) -> DocName = sumo_internal:doc_name(Doc), Schema = sumo_internal:get_schema(DocName), @@ -35,7 +38,7 @@ doc_transform(Fun, Doc) -> FieldName = sumo_internal:field_name(Field), FieldValue = sumo_internal:get_field(FieldName, Doc), FieldAttrs = sumo_internal:field_attrs(Field), - NewValue = Fun({FieldType, FieldName, FieldValue}, FieldAttrs), + NewValue = Fun(FieldType, FieldName, FieldValue, FieldAttrs), sumo_internal:set_field(FieldName, NewValue, Acc) end, Doc, SchemaFields).