Skip to content

Commit

Permalink
Merge pull request #240 from brianjlowe/issue/VIVO-1983
Browse files Browse the repository at this point in the history 
[VIVO-1983] Limit label management values to current locale
  • Loading branch information
@litvinovg
litvinovg committed Jun 17, 2021
2 parents a9a0953 + 3de9a03 commit e1dc5c9
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 35 deletions.
65 changes: 34 additions & 31 deletions .../vitro/webapp/edit/n3editing/configuration/generators/ManageLabelsForPersonGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;

import javax.servlet.http.HttpSession;

Expand All @@ -41,6 +42,7 @@
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ManageLabelsForPersonPreprocessor;
import edu.cornell.mannlib.vitro.webapp.i18n.selection.SelectedLocale;
import edu.cornell.mannlib.vitro.webapp.rdfservice.filter.LanguageFilteringUtils;
import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.DataPropertyStatementTemplateModel;

/**
Expand Down Expand Up @@ -246,12 +248,12 @@ private List<String> getExistingSortedLanguageNamesList() {

private void addFormSpecificData(EditConfigurationVTwo config,
VitroRequest vreq) {
//Get all language codes/labels in the system, and this list is sorted by language name
List<HashMap<String, String>> locales = this.getLocales(vreq);
ArrayList<Literal> existingLabels = this.getExistingLabels(config.getSubjectUri(), vreq);
//Get language codes/labels for existing labels, and this list is sorted by language name
List<HashMap<String, String>> locales = this.getLocales(vreq, existingLabels);
//Get code to label hashmap - we use this to get the language name for the language code returned in the rdf literal
HashMap<String, String> localeCodeToNameMap = this.getFullCodeToLanguageNameMap(locales);
//the labels already added by the user
ArrayList<Literal> existingLabels = this.getExistingLabels(config.getSubjectUri(), vreq);
int numberExistingLabels = existingLabels.size();
//existing labels keyed by language name and each of the list of labels is sorted by language name
HashMap<String, List<LabelInformation>> existingLabelsByLanguageName = this.getLabelsSortedByLanguageName(existingLabels, localeCodeToNameMap, config, vreq);
Expand Down Expand Up @@ -432,28 +434,27 @@ public int compare(LabelInformation l1, LabelInformation l2) {
+ " ?subject rdfs:label ?label \n"
+ "} ORDER BY ?label";


private ArrayList<Literal> getExistingLabels(String subjectUri, VitroRequest vreq) {
String queryStr = QueryUtils.subUriForQueryVar(LABEL_QUERY, "subject", subjectUri);
log.debug("queryStr = " + queryStr);

ArrayList<Literal> labels = new ArrayList<Literal>();
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
Expand All @@ -467,30 +468,32 @@ protected String getTemplate() {
return template;
}

//get locales present in list of literals
public List<HashMap<String, String>> getLocales(VitroRequest vreq,
List<Literal> existingLiterals) {
Set<Locale> locales = new HashSet<Locale>();
for(Literal literal : existingLiterals) {
String language = literal.getLanguage();
if(!StringUtils.isEmpty(language)) {
locales.add(LanguageFilteringUtils.languageToLocale(language));
}
}
if (locales.isEmpty()) {
return Collections.emptyList();
}
List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
for (Locale locale : locales) {
try {
list.add(buildLocaleMap(locale, currentLocale));
} catch (FileNotFoundException e) {
log.warn("Can't show locale '" + locale + "': " + e);
}
}


//get locales
public List<HashMap<String, String>> getLocales(VitroRequest vreq) {
List<Locale> selectables = SelectedLocale.getSelectableLocales(vreq);
if (selectables.isEmpty()) {
return Collections.emptyList();
}
List<HashMap<String, String>> list = new ArrayList<HashMap<String, String>>();
Locale currentLocale = SelectedLocale.getCurrentLocale(vreq);
for (Locale locale : selectables) {
try {
list.add(buildLocaleMap(locale, currentLocale));
} catch (FileNotFoundException e) {
log.warn("Can't show the Locale selector for '" + locale
+ "': " + e);
}
}

return list;
return list;
}



public HashMap<String, String> getFullCodeToLanguageNameMap(List<HashMap<String, String>> localesList) {
HashMap<String, String> codeToLanguageMap = new HashMap<String, String>();
for(Map<String, String> locale: localesList) {
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/webapp/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<#else>
<h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>>
<#-- Label -->
<@p.label individual editable labelCount localesCount/>
<@p.label individual editable labelCount localesCount languageCount />
</h1>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/webapp/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<div id="photo-wrapper">${individualImage}</div>
<h1 itemprop="name" class="vcard foaf-person fn" <#if !editable>style="float:left;border-right:1px solid #A6B1B0;"</#if>>
<#-- Label -->
<@p.label individual editable labelCount localesCount/>
<@p.label individual editable labelCount localesCount languageCount />
</h1>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
Expand Down
2 changes: 1 addition & 1 deletion ...p/src/main/webapp/themes/tenderfoot/templates/body/individual/individual--foaf-person.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<section class="vcard person">
<h1 class="foaf-person">
<#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount languageCount /></span>
</h1>
<section id="preferredTitle">
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/main/webapp/themes/wilma/templates/individual--foaf-person.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<#else>
<h1 class="foaf-person">
<#-- Label -->
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
<span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount languageCount /></span>
</h1>
<section id="preferredTitle">
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
Expand Down

0 comments on commit e1dc5c9

Please sign in to comment.