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

Fix compile error introduced in last commit

Browse source
This commit is contained in:
rjy7 2011-01-05 18:58:23 +00:00
parent 58ff4864e1
commit 75082602f6
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/BaseObjectPropertyDataPostProcessor.java
View file

@ -20,7 +20,7 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
private static String KEY_SUBJECT = "subject"; private static String KEY_SUBJECT = "subject";
private static final String KEY_PROPERTY = "property"; private static final String KEY_PROPERTY = "property";
private static final String DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME = "object";
private static final Pattern QUERY_PATTERN = Pattern.compile("\\?" + KEY_SUBJECT + "\\s+\\?" + KEY_PROPERTY + "\\s+\\?(\\w+)"); private static final Pattern QUERY_PATTERN = Pattern.compile("\\?" + KEY_SUBJECT + "\\s+\\?" + KEY_PROPERTY + "\\s+\\?(\\w+)");
protected ObjectPropertyTemplateModel objectPropertyTemplateModel; protected ObjectPropertyTemplateModel objectPropertyTemplateModel;
@ -33,6 +33,12 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
@Override @Override
public void process(List<Map<String, String>> data) { public void process(List<Map<String, String>> data) {
if (data.isEmpty()) {
log.debug("No data to postprocess for property " + objectPropertyTemplateModel.getUri());
return;
}
removeDuplicates(data); removeDuplicates(data);
for (Map<String, String> map : data) { for (Map<String, String> map : data) {
process(map); process(map);
@ -41,8 +47,8 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
protected abstract void process(Map<String, String> map); protected abstract void process(Map<String, String> map);
/** The SPARQL query results may contain duplicate rows for a single object, if there are multiple assertions for some of the /** The SPARQL query results may contain duplicate rows for a single object, if there are multiple solutions
* other query variables. Remove duplicates here by arbitrarily selecting only the first row returned. * to the entire query. Remove duplicates here by arbitrarily selecting only the first row returned.
* @param List<Map<String, String>> data * @param List<Map<String, String>> data
*/ */
protected void removeDuplicates(List<Map<String, String>> data) { protected void removeDuplicates(List<Map<String, String>> data) {
@ -71,7 +77,7 @@ public abstract class BaseObjectPropertyDataPostProcessor implements
String object = null; String object = null;
if (objectPropertyTemplateModel.hasDefaultListView()) { if (objectPropertyTemplateModel.hasDefaultListView()) {
object = ObjectPropertyTemplateModel.DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME; object = DEFAULT_LIST_VIEW_QUERY_OBJECT_VARIABLE_NAME;
log.debug("Using default list view for property " + objectPropertyTemplateModel.getUri() + log.debug("Using default list view for property " + objectPropertyTemplateModel.getUri() +
", so query object = '" + object + "'"); ", so query object = '" + object + "'");
} else { } else {