From 2a73c96b1d240d4a53d5598d620d206af8ac13a6 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 21 Jun 2012 19:36:44 +0000
Subject: [PATCH] When providing variable for binding, use a merged map of the
 request parameters and the page data.

---
 .../webapp/utils/dataGetter/SparqlQueryDataGetter.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
index 058de06aa..e53847c55 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
@@ -51,8 +51,14 @@ 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));
+    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    	// 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));
     }
 
     /**