Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.85 -r1.86
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 22 Jul 2006 21:21:04 -0000 1.85
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 23 Jul 2006 20:14:31 -0000 1.86
@@ -90,8 +90,10 @@
public static final long MAX_QUESTION_COUNT =20;
public static final long MAX_OPTION_COUNT =10;
public static final int MAX_ATTEMPT_HISTORY =30;
+ public static final String QUESTION_AND_CANDIDATE_ANSWERS_KEY ="questionAndCandidateAnswersKey";
+
/*
* authoring mode constants
*/
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java,v
diff -u -r1.31 -r1.32
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 23 Jul 2006 14:55:12 -0000 1.31
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java 23 Jul 2006 20:14:31 -0000 1.32
@@ -59,6 +59,11 @@
public static void saveFormRequestData(HttpServletRequest request, McLearningForm mcLearningForm)
{
+
+ String httpSessionID=request.getParameter("httpSessionID");
+ logger.debug("httpSessionID: " + httpSessionID);
+ mcLearningForm.setHttpSessionID(httpSessionID);
+
String passMarkApplicable=request.getParameter("passMarkApplicable");
logger.debug("passMarkApplicable: " + passMarkApplicable);
mcLearningForm.setPassMarkApplicable(passMarkApplicable);
@@ -74,6 +79,12 @@
String learnerProgressUserId=request.getParameter("learnerProgressUserId");
logger.debug("learnerProgressUserId: " + learnerProgressUserId);
mcLearningForm.setLearnerProgressUserId(learnerProgressUserId);
+
+ String questionListingMode=request.getParameter("questionListingMode");
+ logger.debug("questionListingMode: " + questionListingMode);
+ mcLearningForm.setQuestionListingMode(questionListingMode);
+
+
logger.debug("done saving form request data.");
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 23 Jul 2006 14:55:12 -0000 1.29
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 23 Jul 2006 20:14:31 -0000 1.30
@@ -66,6 +66,7 @@
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
import org.lamsfoundation.lams.web.session.SessionManager;
import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
/**
* * @author Ozgur Demirtas
@@ -87,83 +88,82 @@
+ validate="false">
-
*
*/
public class McLearningAction extends LamsDispatchAction implements McAppConstants
@@ -271,9 +271,6 @@
logger.debug("toolContentId: " + toolContentId);
mcLearningForm.setToolContentID(toolContentId);
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
logger.debug("mcLearningForm nextQuestionSelected : " + mcLearningForm.getNextQuestionSelected());
if ((mcLearningForm.getNextQuestionSelected() != null) &&
@@ -305,7 +302,6 @@
{
setContentInUse(request, toolContentId, mcService);
logger.debug("requested redoQuestionsOk, user is sure to redo the questions.");
- //mcLearningForm.resetCommands();
return redoQuestions(request, mcLearningForm, mapping);
}
else if (mcLearningForm.getViewAnswers() != null)
@@ -351,27 +347,20 @@
catch (DataMissingException e)
{
logger.debug("failure getting nextUrl: "+ e);
- //mcLearningForm.resetCommands();
- //throw new ServletException(e);
return (mapping.findForward(LEARNING_STARTER));
}
catch (ToolException e)
{
logger.debug("failure getting nextUrl: "+ e);
- //mcLearningForm.resetCommands();
- //throw new ServletException(e);
return (mapping.findForward(LEARNING_STARTER));
}
catch (Exception e)
{
logger.debug("unknown exception getting nextUrl: "+ e);
- //mcLearningForm.resetCommands();
- //throw new ServletException(e);
return (mapping.findForward(LEARNING_STARTER));
}
logger.debug("success getting nextUrl: "+ nextUrl);
- //mcLearningForm.resetCommands();
McQueUsr mcQueUsr=mcService.getMcUserBySession(new Long(userID), mcSession.getUid());
logger.debug("mcQueUsr:" + mcQueUsr);
@@ -405,7 +394,6 @@
return null;
}
- //mcLearningForm.resetCommands();
return (mapping.findForward(LOAD_LEARNER));
}
@@ -435,7 +423,7 @@
List questionEntriesOrdered=mcService.getAllQuestionEntries(mcContent.getUid());
logger.debug("questionEntriesOrdered: " + questionEntriesOrdered);
- Set questionOrderedUids= new TreeSet();
+ Set questionOrderedUids= new TreeSet(new McComparator());
Iterator questionEntriesOrderedIterator=questionEntriesOrdered.iterator();
while (questionEntriesOrderedIterator.hasNext())
{
@@ -462,7 +450,6 @@
}
-
protected List buildSelectedQuestionAndCandidateAnswersDTO(List learnerInput, McTempDataHolderDTO mcTempDataHolderDTO,
IMcService mcService, McContent mcContent)
{
@@ -593,26 +580,87 @@
McLearningForm mcLearningForm = (McLearningForm) form;
IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
logger.debug("retrieving mcService from proxy: " + mcService);
-
- String[] checkedCa=mcLearningForm.getCheckedCa();
- mcLearningForm.resetCa(mapping, request);
+
+ String questionListingMode=mcLearningForm.getQuestionListingMode();
+ logger.debug("questionListingMode: " + questionListingMode);
+
+
+ List learnerInput= new LinkedList();
+ if (questionListingMode.equals(QUESTION_LISTING_MODE_SEQUENTIAL))
+ {
+ logger.debug("listing mode is : " + QUESTION_LISTING_MODE_SEQUENTIAL);
+
+ String httpSessionID=mcLearningForm.getHttpSessionID();
+ logger.debug("httpSessionID: " + httpSessionID);
+
+ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+ logger.debug("sessionMap: " + sessionMap);
+
+
+ List sequentialCheckedCa=(List)sessionMap.get(QUESTION_AND_CANDIDATE_ANSWERS_KEY);
+ logger.debug("pre sequentialCheckedCa: " + sequentialCheckedCa);
+
+ Iterator sequentialCheckedCaIterator=sequentialCheckedCa.iterator();
+ while (sequentialCheckedCaIterator.hasNext())
+ {
+ String input=(String)sequentialCheckedCaIterator.next();
+ logger.debug("input: " + input);
+ }
+
+ /* checkedCa refers to candidate answers */
+ String[] checkedCa=mcLearningForm.getCheckedCa();
+ logger.debug("checkedCa: " + checkedCa);
+
+ if (checkedCa != null)
+ {
+ mcLearningForm.resetCa(mapping, request);
+
+ for (int i=0; i < checkedCa.length ; i++)
+ {
+ String currentCa=checkedCa[i];
+ logger.debug("currentCa: " + currentCa);
+ sequentialCheckedCa.add(currentCa);
+ }
+ }
+
+ logger.debug("post sequentialCheckedCa: " + sequentialCheckedCa);
+ sequentialCheckedCaIterator=sequentialCheckedCa.iterator();
+ while (sequentialCheckedCaIterator.hasNext())
+ {
+ String input=(String)sequentialCheckedCaIterator.next();
+ logger.debug("input: " + input);
+ }
-
- logger.debug("checkedCa: " + checkedCa);
- logger.debug("checkedCa length: " + checkedCa.length );
-
- List learnerInput= new LinkedList();
- for (int i=0; i < checkedCa.length ; i++)
- {
- String currentCa=checkedCa[i];
- logger.debug("currentCa: " + currentCa);
- learnerInput.add(currentCa);
- }
- logger.debug("learnerInput: " + learnerInput);
+ sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
+ request.getSession().setAttribute(httpSessionID, sessionMap);
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
+
+ learnerInput=sequentialCheckedCa;
+ logger.debug("end processing for mode : " + QUESTION_LISTING_MODE_SEQUENTIAL);
+ }
+ else
+ {
+ String[] checkedCa=mcLearningForm.getCheckedCa();
+
+ if (checkedCa != null)
+ {
+ mcLearningForm.resetCa(mapping, request);
+
+ logger.debug("checkedCa: " + checkedCa);
+ logger.debug("checkedCa length: " + checkedCa.length );
+
+ for (int i=0; i < checkedCa.length ; i++)
+ {
+ String currentCa=checkedCa[i];
+ logger.debug("currentCa: " + currentCa);
+ learnerInput.add(currentCa);
+ }
+ }
+ }
+
+ logger.debug("final learnerInput: " + learnerInput);
+
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -643,9 +691,7 @@
logger.debug("totalUserWeight: " + totalUserWeight);
-
-
- McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+ McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
logger.debug("constructed a new mcGeneralLearnerFlowDTO");
mcGeneralLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
@@ -694,9 +740,6 @@
}
*/
- //String toolSessionId=mcLearningForm.getToolSessionId();
- //logger.debug("toolSessionId: " + toolSessionId);
-
Long toolSessionUid=mcSession.getUid();
logger.debug("toolSessionUid: " + toolSessionUid);
@@ -772,7 +815,6 @@
logger.debug("user over passmark:" + mcLearningForm.getUserOverPassMark());
logger.debug("is passmark applicable:" + mcLearningForm.getPassMarkApplicable());
- //mcLearningForm.resetCommands();
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
@@ -806,7 +848,54 @@
String questionIndex=mcLearningForm.getQuestionIndex();
logger.debug("questionIndex: " + questionIndex);
+
+ String httpSessionID=mcLearningForm.getHttpSessionID();
+ logger.debug("httpSessionID: " + httpSessionID);
+
+ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
+ logger.debug("sessionMap: " + sessionMap);
+
+ List sequentialCheckedCa=(List)sessionMap.get(QUESTION_AND_CANDIDATE_ANSWERS_KEY);
+
+ logger.debug("pre sequentialCheckedCa: " + sequentialCheckedCa);
+ Iterator sequentialCheckedCaIterator=sequentialCheckedCa.iterator();
+ while (sequentialCheckedCaIterator.hasNext())
+ {
+ String input=(String)sequentialCheckedCaIterator.next();
+ logger.debug("input: " + input);
+ }
+
+ /* checkedCa refers to candidate answers */
+ String[] checkedCa=mcLearningForm.getCheckedCa();
+ logger.debug("checkedCa: " + checkedCa);
+
+ if (checkedCa != null)
+ {
+ mcLearningForm.resetCa(mapping, request);
+
+ for (int i=0; i < checkedCa.length ; i++)
+ {
+ String currentCa=checkedCa[i];
+ logger.debug("currentCa: " + currentCa);
+ sequentialCheckedCa.add(currentCa);
+ }
+ }
+
+ logger.debug("post sequentialCheckedCa: " + sequentialCheckedCa);
+ sequentialCheckedCaIterator=sequentialCheckedCa.iterator();
+ while (sequentialCheckedCaIterator.hasNext())
+ {
+ String input=(String)sequentialCheckedCaIterator.next();
+ logger.debug("input: " + input);
+ }
+
+
+ sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
+ request.getSession().setAttribute(httpSessionID, sessionMap);
+
+ logger.debug("updated sessionMap : " + sessionMap);
+
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -816,9 +905,6 @@
String toolContentId=mcSession.getMcContent().getMcContentId().toString();
logger.debug("toolContentId: " + toolContentId);
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
McContent mcContent=mcService.retrieveMc(new Long(toolContentId));
logger.debug("mcContent: " + mcContent);
@@ -842,8 +928,6 @@
mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(true).toString());
}
- //mcLearningForm.resetCommands();
-
mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(questionIndex).toString());
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
@@ -874,9 +958,6 @@
McLearningForm mcLearningForm = (McLearningForm) form;
IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -898,12 +979,13 @@
mcGeneralLearnerFlowDTO.setCurrentQuestionIndex(new Integer(1).toString());
mcGeneralLearnerFlowDTO.setTotalCountReached(new Boolean(false).toString());
- //request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
- //request.getSession().setAttribute(TOTAL_COUNT_REACHED, new Boolean(false).toString());
- //String toolSessionId=mcLearningForm.getToolSessionId();
- //logger.debug("toolSessionId: " + toolSessionId);
-
+ SessionMap sessionMap = new SessionMap();
+ List sequentialCheckedCa= new LinkedList();
+ sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ mcLearningForm.setHttpSessionID(sessionMap.getSessionID());
+
String userID = "";
HttpSession ss = SessionManager.getSession();
logger.debug("ss: " + ss);
@@ -932,7 +1014,6 @@
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
- //mcLearningForm.resetCommands();
return (mapping.findForward(REDO_QUESTIONS));
}
@@ -962,9 +1043,6 @@
McLearningForm mcLearningForm = (McLearningForm) form;
IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -1155,7 +1233,6 @@
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
- //mcLearningForm.resetCommands();
return (mapping.findForward(VIEW_ANSWERS));
}
@@ -1183,9 +1260,6 @@
McLearningForm mcLearningForm = (McLearningForm) form;
IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -1235,7 +1309,6 @@
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
- //mcLearningForm.resetCommands();
return (mapping.findForward(RESULTS_SUMMARY));
}
@@ -1277,9 +1350,6 @@
/* reset the checked options MAP */
Map mapGeneralCheckedOptionsContent= new TreeMap(new McComparator());
- //String toolContentId=mcLearningForm.getToolContentId();
- //logger.debug("toolContentId: " + toolContentId);
-
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
@@ -1299,11 +1369,10 @@
logger.debug("LIST_QUESTION_CANDIDATEANSWERS_DTO: " + request.getAttribute(LIST_QUESTION_CANDIDATEANSWERS_DTO));
McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO=LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
+ mcGeneralLearnerFlowDTO.setQuestionIndex(new Integer(1).toString());
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
- //mcLearningForm.resetCommands();
-
logger.debug("fwding to LOAD_LEARNER: " + LOAD_LEARNER);
return (mapping.findForward(LOAD_LEARNER));
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v
diff -u -r1.20 -r1.21
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 23 Jul 2006 14:55:12 -0000 1.20
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 23 Jul 2006 20:14:31 -0000 1.21
@@ -47,7 +47,9 @@
protected String[] checkedCa;
- protected String toolContentID;
+ protected String[] sequentialCheckedCa;
+
+ protected String toolContentID;
protected String toolContentUID;
protected String toolSessionID;
@@ -64,6 +66,7 @@
protected String questionIndex;
protected String nextQuestionSelected;
+ protected String httpSessionID;
public void resetCa(ActionMapping mapping, HttpServletRequest request) {
checkedCa = new String[0];
@@ -377,4 +380,29 @@
public void setToolSessionID(String toolSessionID) {
this.toolSessionID = toolSessionID;
}
+ /**
+ * @return Returns the httpSessionID.
+ */
+ public String getHttpSessionID() {
+ return httpSessionID;
+ }
+ /**
+ * @param httpSessionID The httpSessionID to set.
+ */
+ public void setHttpSessionID(String httpSessionID) {
+ this.httpSessionID = httpSessionID;
+ }
+
+ /**
+ * @return Returns the sequentialCheckedCa.
+ */
+ public String[] getSequentialCheckedCa() {
+ return sequentialCheckedCa;
+ }
+ /**
+ * @param sequentialCheckedCa The sequentialCheckedCa to set.
+ */
+ public void setSequentialCheckedCa(String[] sequentialCheckedCa) {
+ this.sequentialCheckedCa = sequentialCheckedCa;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.54 -r1.55
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 23 Jul 2006 14:55:12 -0000 1.54
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 23 Jul 2006 20:14:31 -0000 1.55
@@ -23,6 +23,7 @@
package org.lamsfoundation.lams.tool.mc.web;
import java.io.IOException;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -54,6 +55,7 @@
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.web.session.SessionManager;
import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
/**
@@ -97,52 +99,55 @@
+ scope="request"
+ validate="false"
+ unknown="false"
+ input="/learningIndex.jsp">
+
+
-
+
*
*/
@@ -201,7 +212,13 @@
return validateParameters;
}
- //String toolSessionID=mcLearningForm.getToolSessionId();
+ SessionMap sessionMap = new SessionMap();
+ List sequentialCheckedCa= new LinkedList();
+ sessionMap.put(QUESTION_AND_CANDIDATE_ANSWERS_KEY, sequentialCheckedCa);
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ mcLearningForm.setHttpSessionID(sessionMap.getSessionID());
+
+
String toolSessionID=request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
logger.debug("retrieved toolSessionID: " + toolSessionID);
mcLearningForm.setToolSessionID(new Long(toolSessionID).toString());
@@ -249,10 +266,12 @@
if (mcContent.isQuestionsSequenced())
{
mcLearnerStarterDTO.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
+ mcLearningForm.setQuestionListingMode(QUESTION_LISTING_MODE_SEQUENTIAL);
}
else
{
mcLearnerStarterDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
+ mcLearningForm.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
}
@@ -265,8 +284,6 @@
request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
mcLearningForm.setToolContentID(mcContent.getMcContentId().toString());
- //mcLearningForm.setToolContentUID(mcContent.getUid().toString());
-
commonContentSetup(request, mcContent, mcService);
@@ -406,8 +423,6 @@
logger.debug("mcQueUsr is not available in the db:" + mcQueUsr);
}
-
- //String learningMode=mcLearningForm.getLearningMode();
logger.debug("users learning mode is: " + mode);
request.setAttribute(MC_LEARNER_STARTER_DTO, mcLearnerStarterDTO);
@@ -477,9 +492,6 @@
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
-
- //request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1");
- //logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX));
}
@@ -551,7 +563,6 @@
return (mapping.findForward(ERROR_LIST));
}
logger.debug("session LEARNING_MODE set to:" + mode);
- //mcLearningForm.setLearningMode(mode);
return null;
}
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/AnswersContent.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_lamc/web/learning/AnswersContent.jsp 23 Jul 2006 14:55:11 -0000 1.17
+++ lams_tool_lamc/web/learning/AnswersContent.jsp 23 Jul 2006 20:14:31 -0000 1.18
@@ -40,9 +40,7 @@