Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v diff -u -r1.24.2.2 -r1.24.2.2.4.1 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java 11 May 2009 07:22:03 -0000 1.24.2.2 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java 23 Jul 2009 05:25:42 -0000 1.24.2.2.4.1 @@ -722,8 +722,7 @@ try { ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId); - // TODO: Un-comment once finished testing as well as the prefix stuff - //Authenticator.authenticate(serverMap, datetime, username, hashValue); + Authenticator.authenticate(serverMap, datetime, username, hashValue); // Get the lesson and activitied given an lsId Lesson lesson = lessonService.getLesson(lsId); @@ -742,8 +741,9 @@ Iterator learnerIterator = lesson.getAllLearners().iterator(); while (learnerIterator.hasNext()) { User learner = (User) learnerIterator.next(); + String userNoPrefixName = learner.getLogin().substring(serverMap.getPrefix().length() + 1); toolOutputsElement.appendChild(getLearnerOutputsElement(document, learner, lesson, activities, - isAuthoredToolOutputs)); + isAuthoredToolOutputs, userNoPrefixName)); } } else { // TODO: handle this error instead of throwing an exception @@ -786,8 +786,7 @@ ExtServerOrgMap serverMap = integrationService.getExtServerOrgMap(serverId); - // TODO: Un-comment once finished testing as well as the prefix stuff - //Authenticator.authenticate(serverMap, datetime, username, hashValue); + Authenticator.authenticate(serverMap, datetime, username, hashValue); ExtUserUseridMap userMap = integrationService.getExistingExtUserUseridMap(serverMap, userStr); if (userMap != null) { @@ -803,9 +802,9 @@ toolOutputsElement.setAttribute(CentralConstants.ATTR_LESSON_ID, "" + lsId); toolOutputsElement.setAttribute("name", lesson.getLessonName()); - + String userNoPrefixName = learner.getLogin().substring(serverMap.getPrefix().length() + 1); toolOutputsElement.appendChild(getLearnerOutputsElement(document, learner, lesson, activities, - isAuthoredToolOutputs)); + isAuthoredToolOutputs, userNoPrefixName)); } } else { // TODO: handle this error instead of throwing an exception @@ -834,9 +833,8 @@ * @return */ private Element getLearnerOutputsElement(Document document, User learner, Lesson lesson, Set activities, - boolean isAuthoredToolOutputs) { + boolean isAuthoredToolOutputs, String userNoPrefixName) { Element learnerElement = document.createElement("LearnerOutput"); - //String userNoPrefixName = learner.getLogin().substring(serverMap.getPrefix().length() + 1); learnerElement.setAttribute("userName", learner.getLogin()); learnerElement.setAttribute("lamsUserName", learner.getLogin()); learnerElement.setAttribute("lamsUserId", learner.getUserId().toString());