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

Adding UTF-8 character encoding to SolrJsonServlet.

Browse source
This commit is contained in:
briancaruso 2011-07-12 20:14:15 +00:00
parent 3be6ec7b86
commit 4890e9cdc9
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/SolrJsonServlet.java
View file

@ -336,9 +336,11 @@ public class SolrJsonServlet extends VitroHttpServlet {
} }
Map<String,String> options = SelectListGenerator.getOptions(editConfig, field, (new VitroRequest(req)).getFullWebappDaoFactory()); Map<String,String> options = SelectListGenerator.getOptions(editConfig, field, (new VitroRequest(req)).getFullWebappDaoFactory());
resp.setContentType("application/json");
ServletOutputStream out = resp.getOutputStream(); resp.setCharacterEncoding("UTF-8");
resp.setContentType("application/json;charset=UTF-8");
ServletOutputStream out = resp.getOutputStream();
out.println("["); out.println("[");
for(String key : options.keySet()){ for(String key : options.keySet()){
JSONArray jsonObj = new JSONArray(); JSONArray jsonObj = new JSONArray();
@ -405,8 +407,9 @@ public class SolrJsonServlet extends VitroHttpServlet {
}catch(JSONException je ){ }catch(JSONException je ){
throw new ServletException(je.getMessage()); throw new ServletException(je.getMessage());
} }
} }
resp.setContentType("application/json"); resp.setCharacterEncoding("UTF-8");
resp.setContentType("application/json;charset=UTF-8");
ServletOutputStream out = resp.getOutputStream(); ServletOutputStream out = resp.getOutputStream();
out.print( ja.toString() ); out.print( ja.toString() );
log.debug("done with getEntitiesByVClassContinuation()"); log.debug("done with getEntitiesByVClassContinuation()");
@ -439,9 +442,8 @@ public class SolrJsonServlet extends VitroHttpServlet {
VitroRequest vreq = new VitroRequest(req); VitroRequest vreq = new VitroRequest(req);
String vclassURI = vreq.getParameter("vclassURI"); String vclassURI = vreq.getParameter("vclassURI");
WebappDaoFactory daos = (new VitroRequest(req)).getFullWebappDaoFactory(); WebappDaoFactory daos = (new VitroRequest(req)).getFullWebappDaoFactory();
resp.setCharacterEncoding("UTF-8"); resp.setCharacterEncoding("UTF-8");
// ServletOutputStream doesn't support UTF-8
PrintWriter out = resp.getWriter(); PrintWriter out = resp.getWriter();
resp.getWriter(); resp.getWriter();
@ -511,7 +513,7 @@ public class SolrJsonServlet extends VitroHttpServlet {
} }
} }
resp.setContentType("application/json"); resp.setContentType("application/json;charset=UTF-8");
out.print( ja.toString() ); out.print( ja.toString() );
log.debug("done with getEntitiesByVClass()"); log.debug("done with getEntitiesByVClass()");