| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/db')
| -rw-r--r-- | src/db/logic/db_access.erl | 20 | ||||
| -rw-r--r-- | src/db/struct/db_model.erl | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/db/logic/db_access.erl b/src/db/logic/db_access.erl index 99d17ea..f7393f0 100644 --- a/src/db/logic/db_access.erl +++ b/src/db/logic/db_access.erl @@ -18,9 +18,9 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec get_value (list(sh_db_item:type())) -> ({'ok', any()} | 'not_found'). +-spec get_value (list(shr_db_item:type())) -> ({'ok', any()} | 'not_found'). get_value ([]) -> not_found; -get_value ([Regval]) -> {ok, sh_db_item:get_value(Regval)}. +get_value ([Regval]) -> {ok, shr_db_item:get_value(Regval)}. -spec read_transaction (atom(), any()) -> ({'ok', any()} | 'not_found'). read_transaction (DB, ID) -> @@ -30,23 +30,23 @@ read_transaction (DB, ID) -> ( atom(), any(), - sh_db_user:permission(), + shr_db_user:permission(), any() ) -> 'ok'. insert_transaction (DB, ID, Perm, Value) -> - StoredItem = sh_db_item:new(ID, Perm, Value), + StoredItem = shr_db_item:new(ID, Perm, Value), % FIXME: handle return value, mnesia:write -> (transaction abort | ok). % FIXME: is this an atomic OP? Is the lock freed afterwards? mnesia:write(DB, StoredItem, sticky_write), ok. --spec query_transaction (sh_db_query:type()) -> 'ok'. +-spec query_transaction (shr_db_query:type()) -> 'ok'. query_transaction (Query) -> - DB = sh_db_query:get_database(Query), - ID = sh_db_query:get_entry_id(Query), + DB = shr_db_query:get_database(Query), + ID = shr_db_query:get_entry_id(Query), [Item] = mnesia:read(DB, ID), - {ok, UpdatedItem} = sh_db_query:apply_to(Query, Item), + {ok, UpdatedItem} = shr_db_query:apply_to(Query, Item), % FIXME: handle return value, mnesia:write -> (transaction abort | ok). % FIXME: is this an atomic OP? Is the lock freed afterwards? mnesia:write(DB, UpdatedItem, sticky_write), @@ -60,11 +60,11 @@ query_transaction (Query) -> read (DB, ID) -> mnesia:transaction(fun read_transaction/2, [DB, ID]). --spec insert (atom(), any(), sh_db_user:permission(), any()) +-spec insert (atom(), any(), shr_db_user:permission(), any()) -> ({'aborted', any()} | {'atomic', 'ok'}). insert (DB, ID, Perm, Value) -> mnesia:transaction(fun insert_transaction/4, [DB, ID, Perm, Value]). --spec query (sh_db_query:type()) -> ({'aborted', any()} | {'atomic', 'ok'}). +-spec query (shr_db_query:type()) -> ({'aborted', any()} | {'atomic', 'ok'}). query (Query) -> mnesia:transaction(fun query_transaction/1, [Query]). diff --git a/src/db/struct/db_model.erl b/src/db/struct/db_model.erl index 3e00b95..e6ec721 100644 --- a/src/db/struct/db_model.erl +++ b/src/db/struct/db_model.erl @@ -61,8 +61,8 @@ start (Model) -> ( DBName, [ - {record_name, sh_db_item:get_record_name()}, - {attributes, sh_db_item:get_record_info()}, + {record_name, shr_db_item:get_record_name()}, + {attributes, shr_db_item:get_record_info()}, {disc_copies, [node()|Neighbors]}, {disc_only_copies, []}, {ram_copies, []}, |