From 10bebc8f2a63150e10ac4acd3f5b71df03ecd2ed Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sat, 5 Jan 2013 18:48:35 +0000 Subject: [PATCH] Loading scheduled tournaments is limited only to one week in advance. --- .../main/java/com/gempukku/lotro/db/DbTournamentDAO.java | 5 +++-- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 8 +++++--- .../java/com/gempukku/lotro/tournament/TournamentDAO.java | 2 +- .../com/gempukku/lotro/tournament/TournamentService.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java index 357b959c0..1f180e1d0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbTournamentDAO.java @@ -190,12 +190,13 @@ public class DbTournamentDAO implements TournamentDAO { } @Override - public List getUnstartedScheduledTournamentQueues() { + public List getUnstartedScheduledTournamentQueues(long tillDate) { try { Connection connection = _dbAccess.getDataSource().getConnection(); try { - PreparedStatement statement = connection.prepareStatement("select tournament_id, name, format, start, cost, playoff, prizes, minimum_players from scheduled_tournament where started = 0"); + PreparedStatement statement = connection.prepareStatement("select tournament_id, name, format, start, cost, playoff, prizes, minimum_players from scheduled_tournament where started = 0 and start<=?"); try { + statement.setLong(1, tillDate); ResultSet rs = statement.executeQuery(); try { List result = new ArrayList(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 391894771..64c4daf9b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -20,6 +20,9 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; public class HallServer extends AbstractServer { + private final int _playerInactivityPeriod = 1000 * 20; // 10 seconds + private final long _scheduledTournamentLoadTime = 1000*60*60*24*7; // Week + private ChatServer _chatServer; private LeagueService _leagueService; private TournamentService _tournamentService; @@ -32,8 +35,6 @@ public class HallServer extends AbstractServer { private CollectionType _allCardsCollectionType = CollectionType.ALL_CARDS; - private final int _playerInactivityPeriod = 1000 * 20; // 10 seconds - private int _nextTableId = 1; private String _motd; @@ -572,7 +573,8 @@ public class HallServer extends AbstractServer { if (_tickCounter == 60) { _tickCounter =0; - List unstartedTournamentQueues = _tournamentService.getUnstartedScheduledTournamentQueues(); + List unstartedTournamentQueues = _tournamentService.getUnstartedScheduledTournamentQueues( + System.currentTimeMillis()+_scheduledTournamentLoadTime); for (TournamentQueueInfo unstartedTournamentQueue : unstartedTournamentQueues) { String scheduledTournamentId = unstartedTournamentQueue.getScheduledTournamentId(); if (!_tournamentQueues.containsKey(scheduledTournamentId)) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java index b3c2a5414..c50f1410b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentDAO.java @@ -19,7 +19,7 @@ public interface TournamentDAO { public void updateTournamentRound(String tournamentId, int round); - public List getUnstartedScheduledTournamentQueues(); + public List getUnstartedScheduledTournamentQueues(long tillDate); public void updateScheduledTournamentStarted(String scheduledTournamentId); } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentService.java index 153c6f5a8..016816a71 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/TournamentService.java @@ -155,7 +155,7 @@ public class TournamentService { return _tournamentMatchDao.getPlayerByes(tournamentId); } - public List getUnstartedScheduledTournamentQueues() { + public List getUnstartedScheduledTournamentQueues(long tillDate) { return _tournamentDao.getUnstartedScheduledTournamentQueues(); }