Fix for getMultilingualText when there's only monolingual text

bvibber · bvibber · commit e98cf731a8f4 · 2013-09-27T14:59:23.000-07:00
Change-Id: I0b69a21225ed6bcf8607f5cef06a298e87820037
diff --git a/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java b/commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
@@ -218,7 +218,7 @@ private Map<String, String> getMultilingualText(Node parentNode) throws IOExcept
                     // Hopefully a language code. Nasty hack!
                     String lang = title;
                     Node valueNode = findTemplateParameter(node, 1);
-                    String value = Utils.getStringFromDOM(valueNode); // hope there's no subtemplates or formatting for now
+                    String value = valueNode.getTextContent(); // hope there's no subtemplates or formatting for now
                     texts.put(lang, value);
                 }
             } else if (node.getNodeType() == Node.TEXT_NODE) {

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ private Map<String, String> getMultilingualText(Node parentNode) throws IOExcept`
`218`	`218`	`// Hopefully a language code. Nasty hack!`
`219`	`219`	`String lang = title;`
`220`	`220`	`Node valueNode = findTemplateParameter(node, 1);`
`221`		`- String value = Utils.getStringFromDOM(valueNode); // hope there's no subtemplates or formatting for now`
	`221`	`+ String value = valueNode.getTextContent(); // hope there's no subtemplates or formatting for now`
`222`	`222`	`texts.put(lang, value);`
`223`	`223`	`}`
`224`	`224`	`} else if (node.getNodeType() == Node.TEXT_NODE) {`