Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	27 Jul 2006 08:14:38 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	27 Jul 2006 10:19:36 -0000	1.2
@@ -67,7 +67,9 @@
     
     protected Map mapQuestions;
     
+    protected Map mapQuestionContentLearner;
     
+    
     /**
      * @return Returns the currentAnswer.
      */
@@ -82,8 +84,8 @@
     }
     protected String userFeedback;
     
-    protected Map mapQuestionContentLearner;
     
+    
     /**
      * @return Returns the mapQuestionContentLearner.
      */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.27 -r1.28
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	27 Jun 2006 13:34:47 -0000	1.27
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	27 Jul 2006 10:19:36 -0000	1.28
@@ -52,7 +52,17 @@
  */
 public class LearningUtil implements QaAppConstants{
 	static Logger logger = Logger.getLogger(LearningUtil.class.getName());
+	
+	public static void saveFormRequestData(HttpServletRequest request, QaLearningForm qaLearningForm)
+	{
+	 	String toolSessionID=request.getParameter("toolSessionID");
+	 	logger.debug("toolSessionID: " + toolSessionID);
+	 	qaLearningForm.setToolSessionID(toolSessionID);
 
+	 	logger.debug("done saving form request data.");
+	}
+
+
     /**
      * createUsersAndResponses(Map mapAnswers, HttpServletRequest request)
      * create users of the responses
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.42 -r1.43
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	27 Jul 2006 08:14:38 -0000	1.42
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	27 Jul 2006 10:19:36 -0000	1.43
@@ -366,6 +366,7 @@
     	//request.getSession().setAttribute(MAP_ANSWERS, mapAnswers);
     	generalLearnerFlowDTO.setMapAnswers(mapAnswers);
     	//request.getSession().setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestions);
+    	generalLearnerFlowDTO.setMapQuestionContentLearner(mapQuestions);
     	generalLearnerFlowDTO.setMapQuestions(mapQuestions);
     	logger.debug("mapQuestions has : " + mapQuestions.size() + " entries.");
     	
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/web/learning/AnswersContent.jsp	26 Jul 2006 21:53:35 -0000	1.12
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	27 Jul 2006 10:19:36 -0000	1.13
@@ -56,37 +56,39 @@
 	<div id="page-learner">
 
 <h1 class="no-tabs-below">
-	<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="false" />
+	<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
 </h1>
 
 <div id="header-no-tabs-learner"></div>
 
 <div id="content-learner">
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
+		<html:hidden property="toolSessionID"/>						
+  		
 			<table class="forms">
 
 			<tr> <td>
 				<html:errors/>
 			</td></tr>
 
-			<c:if test="${mcGeneralLearnerFlowDTO.activityOffline == 'true'}"> 			
+			<c:if test="${generalLearnerFlowDTO.activityOffline == 'true'}"> 			
 				<tr> <td NOWRAP>
 					<bean:message key="label.learning.forceOfflineMessage"/>
 				</td></tr>
 			</c:if> 		
 		
-			<c:if test="${mcGeneralLearnerFlowDTO.activityOffline == 'false'}"> 			
+			<c:if test="${generalLearnerFlowDTO.activityOffline == 'false'}"> 			
 				<tr><td NOWRAP>
-					<c:out value="${mcGeneralLearnerFlowDTO.activityInstructions}" escapeXml="false"/> 
+					<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false"/> 
 				</td></tr>
 	
 				<tr> <td NOWRAP>
-					 <c:out value="${mcGeneralLearnerFlowDTO.userFeedback}" escapeXml="true"/> 
+					 <c:out value="${generalLearnerFlowDTO.userFeedback}" escapeXml="true"/> 
 				</td></tr>
 			
 				<c:choose> 
-				  <c:when test="${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
+				  <c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
 						<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
 					  </c:when> 
 
Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	26 Jul 2006 21:53:35 -0000	1.11
+++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp	27 Jul 2006 10:19:36 -0000	1.12
@@ -33,7 +33,7 @@
 
 			<tr> <td>
 			<table class="forms">
-				<c:forEach var="questionEntry" items="${mcGeneralLearnerFlowDTO.mapQuestionContentLearner}">
+				<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
 						  <tr>
 						  	<td colspan=2 NOWRAP> <b> <bean:message key="label.question"/> <c:out value="${questionEntry.key}" escapeXml="false"/>:  </b>  
 						  		<c:out value="${questionEntry.value}" escapeXml="false"/> 
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	2 Jul 2006 18:59:10 -0000	1.4
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	27 Jul 2006 10:19:36 -0000	1.5
@@ -64,6 +64,7 @@
 <div id="content-learner">
 	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
   		<html:hidden property="method"/>	 
+		<html:hidden property="toolSessionID"/>						  		
 
 				<table class="forms">
 				  <tr><th scope="col">
@@ -94,7 +95,7 @@
 									
 									  <tr>
 										<td colspan=2 NOWRAP >
-											&nbsp&nbsp
+											&nbsp
 									  	 </td>
 									  </tr>
 									
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	26 Jul 2006 21:53:35 -0000	1.12
+++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp	27 Jul 2006 10:19:36 -0000	1.13
@@ -34,8 +34,8 @@
 	<!--question content goes here-->
 			<tr> <td>
 			<table class="forms">
-				<c:forEach var="questionEntry" items="${mcGeneralLearnerFlowDTO.mapQuestionContentLearner}">
-			  		<c:if test="${questionEntry.key == mcGeneralLearnerFlowDTO.currentQuestionIndex}"> 			
+				<c:forEach var="questionEntry" items="${generalLearnerFlowDTO.mapQuestionContentLearner}">
+			  		<c:if test="${questionEntry.key == generalLearnerFlowDTO.currentQuestionIndex}"> 			
 					  <tr>
 						<td colspan=2 NOWRAP> 
 					  		<b> <bean:message key="label.question"/> 
@@ -47,7 +47,7 @@
 					  <tr> 
 						<td NOWRAP>  <b> <bean:message key="label.answer"/> </b> </td>
 						<td NOWRAP>
-				 			<html:text property="answer" size="60" maxlength="255" value="${mcGeneralLearnerFlowDTO.currentAnswer}"/>
+				 			<html:text property="answer" size="60" maxlength="255" value="${generalLearnerFlowDTO.currentAnswer}"/>
 				 			<html:hidden property="currentQuestionIndex" value="${questionEntry.key}"/>
 				 		</td>
 				  	  </tr>
@@ -59,8 +59,8 @@
 			<table class="forms">
 				<tr>
 				<c:choose>  
-				  <c:when test="${(mcGeneralLearnerFlowDTO.currentQuestionIndex == mcGeneralLearnerFlowDTO.totalQuestionCount) && 
-				  				  (sessionScope.totalQuestionCount != 1) }"> 
+				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount != 1) }"> 
 					<td NOWRAP>
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>
@@ -71,8 +71,8 @@
 					</td> 
 				  </c:when> 
 
-  				  <c:when test="${(mcGeneralLearnerFlowDTO.currentQuestionIndex == mcGeneralLearnerFlowDTO.totalQuestionCount) && 
-				  				  (mcGeneralLearnerFlowDTO.totalQuestionCount == 1) }"> 
+  				  <c:when test="${(generalLearnerFlowDTO.currentQuestionIndex == generalLearnerFlowDTO.totalQuestionCount) && 
+				  				  (generalLearnerFlowDTO.totalQuestionCount == 1) }"> 
 					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('submitAnswersContent');" styleClass="button">
 									<bean:message key="button.done"/>
@@ -81,8 +81,8 @@
 				  </c:when> 
 				  
 				  
- 				  <c:when test="${mcGeneralLearnerFlowDTO.currentQuestionIndex != mcGeneralLearnerFlowDTO.totalQuestionCount && 
-				 				  mcGeneralLearnerFlowDTO.currentQuestionIndex > 1}"> 
+ 				  <c:when test="${generalLearnerFlowDTO.currentQuestionIndex != generalLearnerFlowDTO.totalQuestionCount && 
+				 				  generalLearnerFlowDTO.currentQuestionIndex > 1}"> 
 					 <td NOWRAP valign=top> 
 						<html:submit onclick="javascript:submitMethod('getPreviousQuestion');" styleClass="button">
 									<bean:message key="button.getPreviousQuestion"/>