X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FAbstractSettingsScanner.java;fp=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FAbstractSettingsScanner.java;h=0910047ac0d4c11eebda5b5ec16780d48fb17e3b;hp=58ac5b0f65ed4008e02ee4c66bb49bd9c6a0537e;hb=6e8190a376e6ff4e4aa689f918a45135f9745c64;hpb=b0827da4980c41d52ba80eb6540c595145d0717a

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
index 58ac5b0..0910047 100644
--- a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
@@ -53,7 +53,7 @@ public abstract class AbstractSettingsScanner extends AbstractRequestScanner imp
 
     protected String assignUrl(String tournamentId, String pageId) {
         String tournamentUrl = assignUrlWithParams(
-                settings.getTournamentUrl(), settings.getGameQueryParams()
+                settings.getTournamentUrl(), settings.getTournamentQueryParams()
         );
         return RegexBuilder.build(
                 Type.TOURNAMENT,
@@ -76,11 +76,29 @@ public abstract class AbstractSettingsScanner extends AbstractRequestScanner imp
         );
     }
 
+    protected String assignUrl(String gameId, String tournamentId, boolean withTournament) {
+        String gameUrl = settings.getGamePgnUrl() != null
+                ? settings.getGamePgnUrl()
+                : settings.getGameUrl();
+        return RegexBuilder.build(
+                Type.GAME,
+                assignUrlWithParams(gameUrl, settings.getGameQueryParams()),
+                new RegexParams(
+                        gameId,
+                        tournamentId,
+                        withTournament
+                )
+        );
+    }
+
     protected String assignUrl(String query, boolean isUrlEncode) {
         return RegexBuilder.build(
                 Type.QUERY,
                 settings.getTournamentQuery(),
-                new RegexParams(query, isUrlEncode)
+                new RegexParams(
+                        query,
+                        isUrlEncode
+                )
         );
     }