When providing variable for binding, use a merged map of the request parameters and the page data.

This commit is contained in:
j2blake 2012-06-21 19:36:44 +00:00
parent 9b30ecdcb1
commit 2a73c96b1d

View file

@ -52,7 +52,13 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
@Override
public Map<String, Object> getData(Map<String, Object> pageData) {
return doQuery( vreq.getParameterMap(), getModel(context, vreq, modelURI));
// Merge the pageData with the request parameters. PageData overrides
Map<String, String[]> merged = new HashMap<String, String[]>();
merged.putAll(vreq.getParameterMap());
for (String key: pageData.keySet()) {
merged.put(key, new String[] {String.valueOf(pageData.get(key))});
}
return doQuery( merged, getModel(context, vreq, modelURI));
}
/**