[LIB-13] Add function to Scanner API

[chesshog-scanner.git] / src / main / java / org / hedgecode / chess / scanner / portal / AbstractSettingsScanner.java

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 (file)
--- 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
+                )
         );
     }