Fix fetching mids of multiple non-existent files. Closes #745. (#746)

Wikidata · Nov 23, 2022 · e6c7841 · e6c7841
1 parent 9372cc9
commit e6c7841
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/MediaInfoIdQueryAction.java b/wdtk-wikibaseapi/src/main/java/org/wikidata/wdtk/wikibaseapi/MediaInfoIdQueryAction.java
@@ -100,7 +100,7 @@ public Map<String, MediaInfoIdValue> getMediaInfoIds(List<String> fileNames)
 			Map.Entry<String, JsonNode> page = iterator.next();
 			String pageId = page.getKey();
 			String title = page.getValue().get("title").textValue();
-			if (!"-1".equals(pageId)) { // "-1" means not found
+			if (!pageId.startsWith("-")) { // negative keys such as "-1", "-2", ... mean not found
 				midMap.put(title, Datamodel.makeMediaInfoIdValue("M" + pageId, siteIri));
 			}
 		}

diff --git a/wdtk-wikibaseapi/src/test/java/org/wikidata/wdtk/wikibaseapi/WikibaseDataFetcherTest.java b/wdtk-wikibaseapi/src/test/java/org/wikidata/wdtk/wikibaseapi/WikibaseDataFetcherTest.java
@@ -267,6 +267,21 @@ public void testGetMediaInfoIdNotFound() throws IOException, MediaWikiApiErrorEx
 		assertNull(result);
 	}
 
+	@Test
+	public void testGetMediaInfoIdNotFoundTwice() throws IOException, MediaWikiApiErrorException {
+		Map<String, String> parameters = new HashMap<>();
+		parameters.put("action", "query");
+		parameters.put("format", "json");
+		parameters.put("titles", "File:Not Found|File:Not Found Either");
+		con.setWebResourceFromPath(parameters, getClass(),
+				"/query-Not Found twice.json", CompressionType.NONE);
+
+		Map<String, MediaInfoIdValue> result = wdf.getMediaInfoIdsByFileName("Not Found", "Not Found Either");
+		assertEquals(result.size(), 2);
+		assertNull(result.get("Not Found"));
+		assertNull(result.get("Not Found Either"));
+	}
+
 	@Test
 	public void testWbGetVirtualMediaInfoEntityFromTitle() throws IOException, MediaWikiApiErrorException {
 		Map<String, String> parameters = new HashMap<>();

diff --git a/wdtk-wikibaseapi/src/test/resources/query-Not Found twice.json b/wdtk-wikibaseapi/src/test/resources/query-Not Found twice.json
@@ -0,0 +1,17 @@
+{
+  "batchcomplete": "",
+  "query": {
+    "pages": {
+      "-1": {
+        "ns": 6,
+        "title": "File:Not Found",
+        "missing": ""
+      },
+      "-2": {
+        "ns": 6,
+        "title": "File:Not Found Either",
+        "missing": ""
+      }
+    }
+  }
+}