litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-921: some additional validation work as well as dislaying an indicator when a data property has been ingested in an invalid format.

Browse source
This commit is contained in:
Tim Worrall 2015-04-06 14:48:05 -04:00
parent ced99d7703
commit a32ee20a40
7 changed files with 199 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/DataPropertyTemplateModel.java
View file

@ -64,6 +64,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
private DataPropertyListConfig config;
private String objectKey;
private String queryString;
private String rangeDatatypeURI;
private Set<String> constructQueries;
private int displayLimit;
@ -84,6 +85,7 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
statements = new ArrayList<DataPropertyStatementTemplateModel>();
displayLimit = dp.getDisplayLimit();
rangeDatatypeURI = dp.getRangeDatatypeURI();
// If the property is populated, get the data property statements via a sparql query
if (populatedDataPropertyList.contains(dp)) {
log.debug("Getting data for populated data property " + getUri());
@ -161,6 +163,11 @@ public class DataPropertyTemplateModel extends PropertyTemplateModel {
return displayLimit;
}
// @Override
public String getRangeDatatypeURI() {
return rangeDatatypeURI;
}
public ConfigError checkQuery(String queryString) {
if (StringUtils.isBlank(queryString)) {
return ConfigError.NO_SELECT_QUERY;