summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-09-24 17:40:53 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-09-24 17:40:53 +0200
commit23e461d6a2165167b14f73c6f09bcab6114162dd (patch)
tree3bfe34d71015e6a3eb8c13fea8643ce28bd58de6 /src/roster/query
parent3ba41215613a041ef4a0d7efde2ba38f3ac3cdb7 (diff)
Woops, inventory_db isn't there yet...
Diffstat (limited to 'src/roster/query')
-rw-r--r--src/roster/query/rst_load.erl11
-rw-r--r--src/roster/query/rst_update.erl8
2 files changed, 12 insertions, 7 deletions
diff --git a/src/roster/query/rst_load.erl b/src/roster/query/rst_load.erl
index 761d1c9..7871b78 100644
--- a/src/roster/query/rst_load.erl
+++ b/src/roster/query/rst_load.erl
@@ -63,10 +63,15 @@ authenticate_user (Input) ->
fetch_data (Player, Input) ->
PlayerID = Input#input.player_id,
RosterID = shr_player:get_roster_id(Player),
- InventoryID = shr_player:get_inventory_id(Player),
+ % InventoryID = shr_player:get_inventory_id(Player),
- Roster = shr_timed_cache:fetch(char_roster_db, PlayerID, RosterID),
- Inventory = shr_timed_cache:fetch(char_roster_db, PlayerID, InventoryID),
+ Roster = shr_timed_cache:fetch(roster_db, PlayerID, RosterID),
+ %% TODO
+ %% Inventory = shr_timed_cache:fetch(inventory_db, PlayerID, InventoryID),
+
+ io:format("[W] Using shim inventory.~n"),
+
+ Inventory = shr_inventory:new(PlayerID),
#query_state
{
diff --git a/src/roster/query/rst_update.erl b/src/roster/query/rst_update.erl
index 7e53972..4cc0ebc 100644
--- a/src/roster/query/rst_update.erl
+++ b/src/roster/query/rst_update.erl
@@ -73,8 +73,8 @@ fetch_data (Player, Input) ->
RosterID = shr_player:get_roster_id(Player),
InventoryID = shr_player:get_inventory_id(Player),
- Roster = shr_timed_cache:fetch(char_roster_db, PlayerID, RosterID),
- Inventory = shr_timed_cache:fetch(char_roster_db, PlayerID, InventoryID),
+ Roster = shr_timed_cache:fetch(roster_db, PlayerID, RosterID),
+ Inventory = shr_timed_cache:fetch(roster_db, PlayerID, InventoryID),
#query_state
{
@@ -107,7 +107,7 @@ commit_update (QueryState, Input) ->
Query =
shr_db_query:new
(
- char_roster_db,
+ roster_db,
RosterID,
{user, PlayerID},
[
@@ -121,7 +121,7 @@ commit_update (QueryState, Input) ->
),
shr_database:commit(Query),
- shr_timed_cache:update(char_roster_db, PlayerID, RosterID, UpdatedRoster),
+ shr_timed_cache:update(roster_db, PlayerID, RosterID, UpdatedRoster),
'ok'.