Index: lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java 19 Oct 2011 13:32:16 -0000 1.1.2.2 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/LearningDesignSVGServlet.java 19 Oct 2011 17:50:18 -0000 1.1.2.3 @@ -73,30 +73,27 @@ String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME); String hashValue = request.getParameter(CentralConstants.PARAM_HASH_VALUE); String username = request.getParameter(CentralConstants.PARAM_USERNAME); - String modeStr = request.getParameter(CentralConstants.PARAM_MODE); - Long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID); + + Long learningDesignId = WebUtil.readLongParam(request, CentralConstants.PARAM_LEARNING_DESIGN_ID); int imageFormat = WebUtil.readIntParam(request, CentralConstants.PARAM_SVG_FORMAT); if (serverId == null || datetime == null || hashValue == null || username == null) { String msg = "Parameters missing"; log.error(msg); - response.sendError(response.SC_BAD_REQUEST, "Parameters missing"); + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Parameters missing"); } //check imageFormat parameter is correct if (!(imageFormat == SVGGenerator.OUTPUT_FORMAT_SVG) && !(imageFormat == SVGGenerator.OUTPUT_FORMAT_PNG)) { String msg = "Image format parameter is incorrect"; log.error(msg); - response.sendError(response.SC_BAD_REQUEST, msg); + response.sendError(HttpServletResponse.SC_BAD_REQUEST, msg); } // LDEV-2196 preserve character encoding if necessary if (request.getCharacterEncoding() == null) { log.debug("request.getCharacterEncoding is empty, parsing username and courseName as 8859_1 to UTF-8..."); username = new String(username.getBytes("8859_1"), "UTF-8"); - if (courseName != null) { - courseName = new String(courseName.getBytes("8859_1"), "UTF-8"); - } } // get Server map @@ -118,7 +115,7 @@ } catch (Exception e) { log.error("Problem with LearningDesignRepositoryServlet request", e); - response.sendError(response.SC_BAD_REQUEST, "Problem with LearningDesignRepositoryServlet request"); + response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Problem with LearningDesignRepositoryServlet request"); } }