Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partial acceptance of SolrJS related patch - prefix all parameters with v., added in JSON wrapping, but did not include the rawResponse bit yet as it isn't needed by any current example and is planned to be reworked to use SolrJs API more natively 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@718553 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2008-11-18 11:00:31 +00:00
parent a1374ef19c
commit eca2d15122
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contrib/velocity/src/main/java/org/apache/solr/request/VelocityResponseWriter.java
View File

@ -25,6 +25,7 @@ import org.apache.velocity.app.VelocityEngine;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer; import java.io.Writer;
public class VelocityResponseWriter implements QueryResponseWriter { public class VelocityResponseWriter implements QueryResponseWriter {
@ -36,11 +37,22 @@ public class VelocityResponseWriter implements QueryResponseWriter {
VelocityContext context = new VelocityContext(); VelocityContext context = new VelocityContext();
context.put("request", request); // TODO: Make this use the SolrJ API, rather than "embedded" Solr API
context.put("response", response); context.put("request", request); // TODO: inject a SolrRequest instead of a SolrQueryRequest
context.put("response", response); // TODO: inject a SolrResponse instead of a SolrQueryResponse
context.put("page",new PageTool(request,response)); context.put("page",new PageTool(request,response));
context.put("esc", new EscapeTool()); context.put("esc", new EscapeTool());
template.merge(context, writer);
// create output, optionally wrap it into a json object
if (request.getParams().getBool("v.json", false)) {
StringWriter stringWriter = new StringWriter();
template.merge(context, stringWriter);
writer.write(request.getParams().get("v.json") + "(");
writer.write(getJSONWrap(stringWriter.toString()));
writer.write(')');
} else {
template.merge(context, writer);
}
} }
private VelocityEngine getEngine(SolrQueryRequest request) { private VelocityEngine getEngine(SolrQueryRequest request) {
@ -62,7 +74,7 @@ public class VelocityResponseWriter implements QueryResponseWriter {
private Template getTemplate(VelocityEngine engine, SolrQueryRequest request) throws IOException { private Template getTemplate(VelocityEngine engine, SolrQueryRequest request) throws IOException {
Template template; Template template;
try { try {
template = engine.getTemplate(request.getParams().get("template", "browse") + ".vm"); template = engine.getTemplate(request.getParams().get("v.template", "browse") + ".vm");
} catch (Exception e) { } catch (Exception e) {
throw new IOException(e.getMessage()); throw new IOException(e.getMessage());
} }
@ -71,7 +83,17 @@ public class VelocityResponseWriter implements QueryResponseWriter {
} }
public String getContentType(SolrQueryRequest request, SolrQueryResponse response) { public String getContentType(SolrQueryRequest request, SolrQueryResponse response) {
return request.getParams().get("contentType","text/html"); return request.getParams().get("v.contentType","text/html");
}
private String getJSONWrap(String xmlResult) {
// escape the double quotes and backslashes
String replace1 = xmlResult.replaceAll("\\\\", "\\\\\\\\");
replace1 = replace1.replaceAll("\\n", "\\\\n");
replace1 = replace1.replaceAll("\\r", "\\\\r");
String replaced = replace1.replaceAll("\"", "\\\\\"");
// wrap it in a JSON object
return "{\"result\":\"" + replaced + "\"}";
} }
public void init(NamedList args) { public void init(NamedList args) {

2
contrib/velocity/src/main/solr/conf/solrconfig.xml
View File

@ -400,7 +400,7 @@
<requestHandler name="/itas" class="solr.SearchHandler"> <requestHandler name="/itas" class="solr.SearchHandler">
<lst name="defaults"> <lst name="defaults">
<str name="template">browse</str> <str name="v.template">browse</str>
<str name="title">Solritas</str> <str name="title">Solritas</str>
<str name="wt">velocity</str> <str name="wt">velocity</str>