From 43289ba71e117f561f5814406cffb118ce59fbc2 Mon Sep 17 00:00:00 2001 From: Brian Lowe Date: Fri, 28 May 2021 15:52:16 +0300 Subject: [PATCH] Get language-aware results for existing labels in ManageLabelsForPersonGenerator --- .../generators/ManageLabelsForPersonGenerator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java index fe2f2609..41da2d39 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java @@ -432,28 +432,27 @@ public class ManageLabelsForPersonGenerator extends BaseEditConfigurationGenerat + " ?subject rdfs:label ?label \n" + "} ORDER BY ?label"; - + private ArrayList getExistingLabels(String subjectUri, VitroRequest vreq) { String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri); log.debug("queryStr = " + queryStr); ArrayList labels = new ArrayList(); try { - //We want to get the labels for all the languages, not just the display language - ResultSet results = QueryUtils.getLanguageNeutralQueryResults(queryStr, vreq); + // No longer retrieving language-neutral results here, so that + // language editing is consistent with other editing forms. + // Editable values depend on the interface's locale selector. + ResultSet results = QueryUtils.getQueryResults(queryStr, vreq); while (results.hasNext()) { QuerySolution soln = results.nextSolution(); Literal nodeLiteral = soln.get("label").asLiteral(); labels.add(nodeLiteral); - - } } catch (Exception e) { log.error(e, e); } return labels; -} - + } //Putting this into a method allows overriding it in subclasses