Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.55 -r1.56 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 31 Aug 2006 10:23:00 -0000 1.55 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 1 Sep 2006 09:39:07 -0000 1.56 @@ -217,7 +217,7 @@ { QaUtils.cleanUpSessionAbsolute(request); logger.debug("error: The tool expects mcSession."); - persistError(request,"error.toolSession.notAvailable"); + //persistError(request,"error.toolSession.notAvailable"); return (mapping.findForward(ERROR_LIST_LEARNER)); } @@ -244,7 +244,7 @@ { QaUtils.cleanUpSessionAbsolute(request); logger.debug("error: The tool expects qaContent."); - persistError(request,"error.toolContent.notAvailable"); + //persistError(request,"error.toolContent.notAvailable"); return (mapping.findForward(ERROR_LIST_LEARNER)); } @@ -541,7 +541,7 @@ catch(NumberFormatException e) { QaUtils.cleanUpSessionAbsolute(request); - persistError(request, "error.sessionId.numberFormatException"); + //persistError(request, "error.sessionId.numberFormatException"); logger.debug("add error.sessionId.numberFormatException to ActionMessages."); return (mapping.findForward(ERROR_LIST_LEARNER)); } @@ -554,14 +554,14 @@ if ((mode == null) || (mode.length() == 0)) { QaUtils.cleanUpSessionAbsolute(request); - persistError(request, "error.mode.required"); + //persistError(request, "error.mode.required"); return (mapping.findForward(ERROR_LIST_LEARNER)); } if ((!mode.equals("learner")) && (!mode.equals("teacher")) && (!mode.equals("author"))) { QaUtils.cleanUpSessionAbsolute(request); - persistError(request, "error.mode.invalid"); + //persistError(request, "error.mode.invalid"); return (mapping.findForward(ERROR_LIST_LEARNER)); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.41 -r1.42 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 5 Aug 2006 14:08:02 -0000 1.41 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 1 Sep 2006 09:39:07 -0000 1.42 @@ -239,33 +239,10 @@ if (qaContent == null) { QaUtils.cleanUpSessionAbsolute(request); - persistError(request, "error.content.doesNotExist"); + //persistError(request, "error.content.doesNotExist"); return false; } - /* - if (qaContent.getTitle() == null) - { - generalMonitoringDTO.setActivityTitle("Questions and Answers"); - generalMonitoringDTO.setActivityInstructions("Please answer the questions."); - } - else - { - generalMonitoringDTO.setActivityTitle(qaContent.getTitle()); - generalMonitoringDTO.setActivityInstructions(qaContent.getInstructions()); - } - */ - - /* - if (qaService.studentActivityOccurred(qaContent)) - { - QaUtils.cleanUpSessionAbsolute(request); - logger.debug("student activity occurred on this content:" + qaContent); - //request.getSession().setAttribute(USER_EXCEPTION_CONTENT_IN_USE, new Boolean(true).toString()); - generalMonitoringDTO.setUserExceptionContentInUse(new Boolean(true).toString()); - } - */ - QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); logger.debug("refreshing summary data..."); @@ -301,7 +278,7 @@ if ((strToolContentId == null) || (strToolContentId.length() == 0)) { - persistError(request, "error.contentId.required"); + //persistError(request, "error.contentId.required"); QaUtils.cleanUpSessionAbsolute(request); return (mapping.findForward(ERROR_LIST)); } @@ -316,7 +293,7 @@ } catch(NumberFormatException e) { - persistError(request, "error.contentId.numberFormatException"); + //persistError(request, "error.contentId.numberFormatException"); logger.debug("add error.contentId.numberFormatException to ActionMessages."); QaUtils.cleanUpSessionAbsolute(request); return (mapping.findForward(ERROR_LIST)); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.52 -r1.53 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 17 Aug 2006 21:43:06 -0000 1.52 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 1 Sep 2006 09:39:07 -0000 1.53 @@ -300,7 +300,7 @@ if ((strToolContentID == null) || (strToolContentID.equals(""))) { QaUtils.cleanUpSessionAbsolute(request); - persistError(request,"error.contentId.required"); + //persistError(request,"error.contentId.required"); logger.debug("forwarding to: " + ERROR_LIST); return (mapping.findForward(ERROR_LIST)); } @@ -515,7 +515,7 @@ { QaUtils.cleanUpSessionAbsolute(request); logger.debug("default content id has not been setup"); - persistError(request,"error.defaultContent.notSetup"); + //persistError(request,"error.defaultContent.notSetup"); return (mapping.findForward(ERROR_LIST)); } }