Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== RCS file: /usr/local/cvsroot/lams_bb_integration/RELEASE_NOTES.TXT,v diff -u -r1.38 -r1.39 --- lams_bb_integration/RELEASE_NOTES.TXT 21 Dec 2016 17:06:16 -0000 1.38 +++ lams_bb_integration/RELEASE_NOTES.TXT 23 Dec 2016 16:18:11 -0000 1.39 @@ -140,3 +140,4 @@ * LDEV-4162: Add a parameter to LearningDesignSVG for lessonId * LDEV-4163: Integration API that returns true if the LD has outputs * LDEV-4164: Fix sorting in BB content area +* LDEV-4171: Remove obsolete svgFormat parameter that is no longer used in WF as long as it produces only SVGs (no PNGs) Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java,v diff -u -r1.4 -r1.5 --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java 4 Aug 2016 16:52:40 -0000 1.4 +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java 23 Dec 2016 16:18:11 -0000 1.5 @@ -81,7 +81,7 @@ ctx = ctxMgr.setContext(request); String username = ctx.getUser().getUserName(); - String learningDesignImageUrl = LamsSecurityUtil.generateRequestLearningDesignImage(username, false) + "&ldId=" + learningDesignId; + String learningDesignImageUrl = LamsSecurityUtil.generateRequestLearningDesignImage(username) + "&ldId=" + learningDesignId; response.sendRedirect(learningDesignImageUrl); } catch (InitializationException e) { Index: lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java,v diff -u -r1.4 -r1.5 --- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java 23 Nov 2016 12:43:07 -0000 1.4 +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java 23 Dec 2016 16:18:11 -0000 1.5 @@ -181,15 +181,13 @@ * @return a url pointing to the LAMS lesson, monitor, author session * @throws UnsupportedEncodingException */ - public static String generateRequestLearningDesignImage(String username, boolean isSvgImage) throws UnsupportedEncodingException { + public static String generateRequestLearningDesignImage(String username) throws UnsupportedEncodingException { String serverAddr = getServerAddress(); - int svgFormat = (isSvgImage) ? 1 : 2; //$request = "$CFG->lamslesson_serverurl/services/LearningDesignSVG?serverId=" . $CFG->lamslesson_serverid . "&datetime=" . $datetime_encoded . "&hashValue=" . //$hashvalue . "&username=" . $username . "&courseId=" . $courseid . "&courseName=" . urlencode($coursename) . "&mode=2&country=" . $country . "&lang=" . $lang . - //"&ldId=" . $ldid . "&svgFormat=" . $format; - String url = serverAddr + "/services/LearningDesignSVG?" + generateAuthenticateParameters(username) - + "&svgFormat=" + svgFormat; + //"&ldId=" . $ldid; + String url = serverAddr + "/services/LearningDesignSVG?" + generateAuthenticateParameters(username); logger.info("LAMS Req: " + url); Index: lams_bb_integration/web/modules/learnermonitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_bb_integration/web/modules/learnermonitor.jsp,v diff -u -r1.29 -r1.30 --- lams_bb_integration/web/modules/learnermonitor.jsp 20 Dec 2016 10:42:16 -0000 1.29 +++ lams_bb_integration/web/modules/learnermonitor.jsp 23 Dec 2016 16:18:11 -0000 1.30 @@ -153,8 +153,7 @@ String learningDesignImageUrl = ""; if (isDisplayDesignImage) { String username = ctx.getUser().getUserName(); - learningDesignImageUrl = LamsSecurityUtil.generateRequestLearningDesignImage(username, false) + "&lsId=" - + lessonId; + learningDesignImageUrl = LamsSecurityUtil.generateRequestLearningDesignImage(username) + "&lsId=" + lessonId; } //check whether user has score for this lesson