Get debug to okay the src files.

2 files changed, 1 insertions, 159 deletions

diff --git a/src/shared/io/shr_database.erl b/src/shared/io/shr_database.erl
deleted file mode 100644
index c1792dc..0000000
--- a/src/shared/io/shr_database.erl
+++ /dev/null
@@ -1,158 +0,0 @@
--module(shr_database).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export
-(
-   [
-      insert_at/5,
-      insert/4,
-      remove/3,
-      fetch/3,
-      reserve/3,
-      commit/1
-   ]
-).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec get_debug_db_node () -> node().
-get_debug_db_node () -> list_to_atom("db_node@" ++ net_adm:localhost()).
-
--spec get_random_db_node () -> node().
-get_random_db_node () ->
-   get_debug_db_node().
-
--spec get_db_node_for (binary()) -> node().
-get_db_node_for (_ObjectID) ->
-   get_debug_db_node().
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec insert_at
-   (
-      atom(),
-      binary(),
-      shr_db_user:permission(),
-      shr_db_user:permission(),
-      any()
-   )
-   -> 'ok'.
-insert_at (DB, ObjectID, ReadPerm, WritePerm, Value) ->
-   DBNode = get_db_node_for(ObjectID),
-
-   {atomic, _} =
-      rpc:call
-      (
-         DBNode,
-         db_access,
-         insert_at,
-         [DB, ObjectID, ReadPerm, WritePerm, Value]
-      ),
-
-   io:format
-   (
-      "~nshr_database:insert_at(~p) ! ~p -> ok.~n",
-      [{DB, ObjectID, ReadPerm, WritePerm, Value}, DBNode]
-   ),
-
-   ok.
-
--spec insert
-   (
-      atom(),
-      shr_db_user:permission(),
-      shr_db_user:permission(),
-      any()
-   )
-   -> {'ok', binary()}.
-insert (DB, ReadPerm, WritePerm, Value) ->
-   DBNode = get_random_db_node(),
-
-   {atomic, {ok, ID}} =
-      rpc:call(DBNode, db_access, insert, [DB, ReadPerm, WritePerm, Value]),
-
-   io:format
-   (
-      "~nshr_database:insert(~p) ! ~p -> ok.~n",
-      [{DB, ReadPerm, WritePerm, Value}, DBNode]
-   ),
-
-   {ok, ID}.
-
--spec fetch
-   (
-      atom(),
-      binary(),
-      shr_db_user:user()
-   )
-   -> ({'ok', any()} | 'not_found').
-fetch (DB, ObjectID, Cred) ->
-   DBNode = get_db_node_for(ObjectID),
-
-   {atomic, Reply} = rpc:call(DBNode, db_access, read, [DB, ObjectID, Cred]),
-
-   io:format
-   (
-      "~nshr_database:fetch(~p) ! ~p -> ~p.~n",
-      [{DB, ObjectID, Cred}, DBNode, Reply]
-   ),
-
-   Reply.
-
--spec commit (shr_db_query:type()) -> 'ok'.
-commit (Query) ->
-   DBNode = get_db_node_for(shr_db_query:get_entry_id(Query)),
-
-   {atomic, ok} = rpc:call(DBNode, db_access, query, [Query]),
-
-   io:format("~nshr_database:commit(~p) ! ~p -> ok.~n", [Query, DBNode]),
-
-   ok.
-
--spec remove
-   (
-      atom(),
-      binary(),
-      shr_db_user:user()
-   )
-   -> ('ok' | 'not_found').
-remove (DB, ObjectID, Cred) ->
-   DBNode = get_db_node_for(ObjectID),
-
-   {atomic, _} = rpc:call(DBNode, db_access, remove, [DB, ObjectID, Cred]),
-
-   io:format
-   (
-      "~nshr_database:remove(~p) ! ~p -> ok.~n",
-      [{DB, ObjectID, Cred}, DBNode]
-   ),
-
-   ok.
-
--spec reserve
-   (
-      atom(),
-      binary(),
-      shr_db_user:user()
-   )
-   -> ('ok' | 'not_found').
-reserve (DB, ObjectID, Cred) ->
-   DBNode = get_db_node_for(ObjectID),
-
-   {atomic, _} = rpc:call(DBNode, db_access, reserve, [DB, ObjectID, Cred]),
-
-   io:format
-   (
-      "~nshr_database:reserve(~p) ! ~p -> ok.~n",
-      [{DB, ObjectID, Cred}, DBNode]
-   ),
-
-   ok.
diff --git a/src/shared/io/shr_timed_cache.erl b/src/shared/io/shr_timed_cache.erl
index de3d094..ff6e13d 100644
--- a/src/shared/io/shr_timed_cache.erl
+++ b/src/shared/io/shr_timed_cache.erl
@@ -38,7 +38,7 @@
 -spec add_to_cache (atom(), any(), any()) -> any().
 add_to_cache (DB, Owner, ObjectID) ->
    {ok, TimerPID} = gen_server:start(?MODULE, {DB, {Owner, ObjectID}}, []),
-   {ok, Data} = shr_database:fetch(DB, ObjectID, Owner),
+   {ok, Data} = ataxia_client:fetch(DB, Owner, ObjectID),
    ets:insert(DB, {{Owner, ObjectID}, TimerPID, Data}),
    Data.