Index: lams_bb_integration/RELEASE_NOTES.TXT =================================================================== diff -u -rc2d3407a0f824ccd6879b4081e8fd93df53d4d97 -r8d92365c1f399beb957a1ac353436d5f5e8016fe --- lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision c2d3407a0f824ccd6879b4081e8fd93df53d4d97) +++ lams_bb_integration/RELEASE_NOTES.TXT (.../RELEASE_NOTES.TXT) (revision 8d92365c1f399beb957a1ac353436d5f5e8016fe) @@ -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 =================================================================== diff -u -r67bf7cc2eed9d841593d383cf139d63a65e1a8a6 -r8d92365c1f399beb957a1ac353436d5f5e8016fe --- lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java (.../RenderDesignImageServlet.java) (revision 67bf7cc2eed9d841593d383cf139d63a65e1a8a6) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/RenderDesignImageServlet.java (.../RenderDesignImageServlet.java) (revision 8d92365c1f399beb957a1ac353436d5f5e8016fe) @@ -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 =================================================================== diff -u -rb36ef67f811fceb8dfd0d6371d5c715268afd986 -r8d92365c1f399beb957a1ac353436d5f5e8016fe --- lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision b36ef67f811fceb8dfd0d6371d5c715268afd986) +++ lams_bb_integration/src/org/lamsfoundation/ld/integration/util/LamsSecurityUtil.java (.../LamsSecurityUtil.java) (revision 8d92365c1f399beb957a1ac353436d5f5e8016fe) @@ -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 =================================================================== diff -u -rd573dde079052dcf9bca63898d6a224fb7080cba -r8d92365c1f399beb957a1ac353436d5f5e8016fe --- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision d573dde079052dcf9bca63898d6a224fb7080cba) +++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 8d92365c1f399beb957a1ac353436d5f5e8016fe) @@ -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