*Disable maxlag on certain interactive modes.

MER-C · MER-C · commit c87d21c20e80 · 2025-03-29T17:38:01.000Z
*Suppress INFO logging on GAE.
*Fix test broken by on-wiki changes.
*Cross-wiki linksearch servlets: parallelise at 3 because GAE runtime is too slow.
*Wiki: fix api url.
diff --git a/src/org/wikipedia/Wiki.java b/src/org/wikipedia/Wiki.java
@@ -8417,12 +8417,12 @@ public String makeApiCall(Map<String, String> getparams, Map<String, Object> pos
         getparams.putAll(defaultApiParams);
         for (Map.Entry<String, String> entry : getparams.entrySet())
         {
-            urlbuilder.append('&');
             urlbuilder.append(entry.getKey());
             urlbuilder.append('=');
             urlbuilder.append(URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8));
+            urlbuilder.append('&');
         }
-        String url = urlbuilder.toString();
+        String url = urlbuilder.deleteCharAt(urlbuilder.length() - 1).toString();
 
         // POST stuff
         boolean isPOST = (postparams != null && !postparams.isEmpty());
diff --git a/src/org/wikipedia/servlets/linksearch.jsp b/src/org/wikipedia/servlets/linksearch.jsp
@@ -82,11 +82,11 @@ reasons, results are limited to <%= limit %> links per wiki.
     {
         results = switch (set)
         {
-            case "top25" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1, 
+            case "top25" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3, 
                 domain, AllWikiLinksearch.TOP25, mailto, ns);
-            case "top50" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1, 
+            case "top50" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3, 
                 domain, AllWikiLinksearch.TOP50, mailto, ns);
-            case "major" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1, 
+            case "major" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3, 
                 domain, AllWikiLinksearch.MAJOR_WIKIS, mailto, ns);
             default -> 
             {
diff --git a/src/org/wikipedia/tools/CCIAnalyzer.java b/src/org/wikipedia/tools/CCIAnalyzer.java
@@ -86,6 +86,7 @@ public static void main(String[] args) throws IOException
 
         // load CCIs
         Wiki enWiki = Wiki.newSession("en.wikipedia.org");
+        enWiki.setMaxLag(-1);
         enWiki.setLogLevel(Level.WARNING);
         String ccipage = parsedargs.get("default");
         List<CCIPage> pages;
diff --git a/src/org/wikipedia/tools/ContributionSurveyor.java b/src/org/wikipedia/tools/ContributionSurveyor.java
@@ -112,6 +112,7 @@ public static void main(String[] args) throws IOException
             ns = new int[] { Wiki.MAIN_NAMESPACE };
         
         ContributionSurveyor surveyor = makeContributionSurveyor(homewiki, parsedargs);
+        homewiki.setMaxLag(-1);
         StringBuilder temp = new StringBuilder("Command line: <kbd>java org.wikipedia.tools.ContributionSurveyor");
         for (String arg : args)
         {
diff --git a/test/org/wikipedia/WikiTest.java b/test/org/wikipedia/WikiTest.java
@@ -410,7 +410,7 @@ public void getTemplates() throws Exception
 
         pages = List.of(pages.get(1));
         assertTrue(testWiki.getTemplates(pages, Wiki.MAIN_NAMESPACE).get(0).isEmpty(), "namespace filter");
-        assertEquals(List.of("Template:La"), testWiki.getTemplates(pages, Wiki.TEMPLATE_NAMESPACE).get(0), "namespace filter");
+        assertEquals(List.of("Template:!="), testWiki.getTemplates(pages, Wiki.TEMPLATE_NAMESPACE).get(0), "namespace filter");
     }
 
     @Test
diff --git a/web/WEB-INF/app.yaml b/web/WEB-INF/app.yaml
@@ -1,5 +1,5 @@
 runtime: java21
-entrypoint: 'java -jar jetty/start.jar'
+entrypoint: 'java -jar -Djava.util.logging.config.file=WEB-INF/logging.properties jetty/start.jar'
 
 error_handlers:
   - file: timeout.html
diff --git a/web/WEB-INF/logging.properties b/web/WEB-INF/logging.properties
@@ -0,0 +1 @@
+.level=WARNING

Original file line number	Diff line number	Diff line change
`@@ -8417,12 +8417,12 @@ public String makeApiCall(Map<String, String> getparams, Map<String, Object> pos`
`8417`	`8417`	`getparams.putAll(defaultApiParams);`
`8418`	`8418`	`for (Map.Entry<String, String> entry : getparams.entrySet())`
`8419`	`8419`	`{`
`8420`		`- urlbuilder.append('&');`
`8421`	`8420`	`urlbuilder.append(entry.getKey());`
`8422`	`8421`	`urlbuilder.append('=');`
`8423`	`8422`	`urlbuilder.append(URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8));`
	`8423`	`+ urlbuilder.append('&');`
`8424`	`8424`	`}`
`8425`		`- String url = urlbuilder.toString();`
	`8425`	`+ String url = urlbuilder.deleteCharAt(urlbuilder.length() - 1).toString();`
`8426`	`8426`
`8427`	`8427`	`// POST stuff`
`8428`	`8428`	`boolean isPOST = (postparams != null && !postparams.isEmpty());`
Original file line number	Diff line number	Diff line change
`@@ -82,11 +82,11 @@ reasons, results are limited to <%= limit %> links per wiki.`
`82`	`82`	`{`
`83`	`83`	`results = switch (set)`
`84`	`84`	`{`
`85`		`- case "top25" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1,`
	`85`	`+ case "top25" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3,`
`86`	`86`	`domain, AllWikiLinksearch.TOP25, mailto, ns);`
`87`		`- case "top50" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1,`
	`87`	`+ case "top50" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3,`
`88`	`88`	`domain, AllWikiLinksearch.TOP50, mailto, ns);`
`89`		`- case "major" -> AllWikiLinksearch.crossWikiLinksearch(limit, 1,`
	`89`	`+ case "major" -> AllWikiLinksearch.crossWikiLinksearch(limit, 3,`
`90`	`90`	`domain, AllWikiLinksearch.MAJOR_WIKIS, mailto, ns);`
`91`	`91`	`default ->`
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ public static void main(String[] args) throws IOException`
`112`	`112`	`ns = new int[] { Wiki.MAIN_NAMESPACE };`
`113`	`113`
`114`	`114`	`ContributionSurveyor surveyor = makeContributionSurveyor(homewiki, parsedargs);`
	`115`	`+ homewiki.setMaxLag(-1);`
`115`	`116`	`StringBuilder temp = new StringBuilder("Command line: <kbd>java org.wikipedia.tools.ContributionSurveyor");`
`116`	`117`	`for (String arg : args)`
`117`	`118`	`{`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public void getTemplates() throws Exception`
`410`	`410`
`411`	`411`	`pages = List.of(pages.get(1));`
`412`	`412`	`assertTrue(testWiki.getTemplates(pages, Wiki.MAIN_NAMESPACE).get(0).isEmpty(), "namespace filter");`
`413`		`- assertEquals(List.of("Template:La"), testWiki.getTemplates(pages, Wiki.TEMPLATE_NAMESPACE).get(0), "namespace filter");`
	`413`	`+ assertEquals(List.of("Template:!="), testWiki.getTemplates(pages, Wiki.TEMPLATE_NAMESPACE).get(0), "namespace filter");`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`@Test`