X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessGamesScanner.java;h=6346929903e0a3cea794a72fcd4fa13abf930728;hp=c07e3925719b49368eab9200cf93953dcd50222b;hb=6e8190a376e6ff4e4aa689f918a45135f9745c64;hpb=412ff2a5b5855bf769e2b767896bfa59f927dde2

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
index c07e392..6346929 100644
--- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
@@ -23,8 +23,6 @@ import java.util.Map;
 import org.hedgecode.chess.scanner.ChessHogScannerException;
 import org.hedgecode.chess.scanner.entity.PGNGame;
 import org.hedgecode.chess.scanner.entity.PGNTournament;
-import org.hedgecode.chess.scanner.regex.RegexMatcherResult;
-import org.hedgecode.chess.scanner.regex.RegexResult;
 
 /**
  * ChessGamesScanner
@@ -49,18 +47,15 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
 
     @Override
     public PGNTournament findTournament(String tournamentName) throws ChessHogScannerException {
-        RegexResult result = matchRequest(
+        Map<String, String> result = matchMap(
                 assignUrl(
                         tournamentName, true
                 ),
-                new RegexMatcherResult(
-                        getSettings().getTournamentQueryUrlRegex(),
-                        true,
-                        true
-                )
+                getSettings().getTournamentQueryUrlRegex(),
+                true
         );
         PGNTournament tournament = null;
-        for (Map.Entry<String, String> entry : result.resultMap().entrySet()) {
+        for (Map.Entry<String, String> entry : result.entrySet()) {
             if (entry.getValue().contains(tournamentName)) { // todo: contains?
                 tournament = new PGNTournament(
                         entry.getKey(),
@@ -84,6 +79,11 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
         );
     }
 
+    @Override
+    public PGNGame getGame(String gameId, String tournamentId) throws ChessHogScannerException {
+        return getGame(gameId);
+    }
+
     private void assignTournamentGames(PGNTournament tournament) throws ChessHogScannerException {
         tournament.clearGames();
         List<String> gamesId = new ArrayList<>();
@@ -91,7 +91,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
         List<String> pageGamesId;
         int pageId = 0;
         do {
-            pageGamesId = matchRequest(
+            pageGamesId = match(
                     assignUrl(
                             tournament.id(),
                             Integer.toString(++pageId)