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

VIVO-495 fix bug in query-binding code.

Browse source
This commit is contained in:
j2blake 2013-11-06 11:43:33 -05:00
parent ef25ee4dd6
commit 7f67b1b7da
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/edu/cornell/mannlib/vitro/webapp/services/shortview/FakeApplicationOntologyService.java
View file

@ -442,7 +442,7 @@ public class FakeApplicationOntologyService {
private static String QUERY_STRING = "" private static String QUERY_STRING = ""
+ "PREFIX obo: <http://purl.obolibrary.org/obo/> \n" + "PREFIX obo: <http://purl.obolibrary.org/obo/> \n"
+ "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n" + "PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> \n"
+ "SELECT ?uri ?pt \n" + "WHERE { \n" + "SELECT ?pt \n" + "WHERE { \n"
+ " ?uri obo:ARG_2000028 ?vIndividual . \n" + " ?uri obo:ARG_2000028 ?vIndividual . \n"
+ " ?vIndividual vcard:hasTitle ?vTitle . \n" + " ?vIndividual vcard:hasTitle ?vTitle . \n"
+ " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1"; + " ?vTitle vcard:title ?pt . \n" + "} LIMIT 1";

12
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SparqlQueryDataGetter.java
View file

@ -148,6 +148,10 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
for (String key: pageData.keySet()) { for (String key: pageData.keySet()) {
merged.put(key, String.valueOf(pageData.get(key))); merged.put(key, String.valueOf(pageData.get(key)));
} }
if (log.isDebugEnabled()) {
log.debug("Merging request parameters " + parameterMap
+ " with page data " + pageData + " results in " + merged);
}
return merged; return merged;
} }
@ -161,9 +165,13 @@ public class SparqlQueryDataGetter extends DataGetterBase implements DataGetter{
private String bindParameters(String text, Map<String, String> merged) { private String bindParameters(String text, Map<String, String> merged) {
String bound = text; String bound = text;
for (String key : merged.keySet()) { for (String key : merged.keySet()) {
bound.replace('?' + key, '<' + merged.get(key) + '>'); bound = bound.replace('?' + key, '<' + merged.get(key) + '>');
}
if (log.isDebugEnabled()) {
log.debug("parameters: " + merged);
log.debug("query before binding parameters:" + text);
log.debug("query after binding parameters: " + bound);
} }
log.debug("query after binding parameters: " + bound);
return bound; return bound;
} }