Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/Attic/ExportPortfolioAction.java,v
diff -u -r1.4 -r1.5
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	13 Oct 2005 07:50:16 -0000	1.4
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	20 Oct 2005 05:39:45 -0000	1.5
@@ -30,28 +30,31 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
 
 import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.web.action.LamsAction;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.learning.export.Portfolio;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioException;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.apache.struts.action.ActionForward;
-import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.learning.export.service.IExportPortfolioService;
 import org.lamsfoundation.lams.learning.export.service.ExportPortfolioServiceProxy;
-import org.lamsfoundation.lams.learning.export.Portfolio;
-import org.lamsfoundation.lams.lesson.Lesson;
-
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learning.service.LearnerServiceProxy;
+import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
+import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /** ----------------XDoclet Tags--------------------
  * 
- * @struts:action path="/exportPortfolio" 
+ * @struts:action path="/exportPortfolio" type="org.lamsfoundation.lams.learning.export.web.action.ExportPortfolioAction"
  *                       validate="false"
  * @struts.action-exception key="error.system.exportPortfolio" scope="request"
  *                          type="org.lamsfoundation.lams.learning.export.ExportPortfolioException"
@@ -60,6 +63,7 @@
  * 
  * @struts:action-forward name="displayPrintVersion" path="/exportPortfolioPrintVersion.jsp"
  * @struts:action-forward name="displayPortfolio" path="/exportPortfolio.jsp"
+ * @struts:action-forward name="loadExportPage" path="/exportWaitingPage.jsp" 
  * -------------------------------------------------
  **/
 
@@ -82,25 +86,26 @@
 		if (mode.equals(ToolAccessMode.LEARNER.toString()))
 		{
 			//get the learnerprogress id
-			User learner = LearningWebUtil.getUserData(request, getServlet().getServletContext());
-			LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgressByUser(request, getServlet().getServletContext());
-			Long progressId = learnerProgress.getLearnerProgressId();
-			
-			portfolios = exportService.exportPortfolioForStudent(progressId, learner, true, cookies);
+		    HttpSession session = SessionManager.getSession();
+		    UserDTO userDto = (UserDTO)session.getAttribute(AttributeNames.USER);
+		    Integer userId = userDto.getUserID();
+		    
+		    Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
+		    portfolios = exportService.exportPortfolioForStudent(userId, lessonID, true, cookies);
 		}
 		else if(mode.equals(ToolAccessMode.TEACHER.toString()))
 		{
 			//get the lesson data
 			//done in the monitoring environment
-			Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID"));
-			ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
-			Lesson lesson = learnerService.getLesson(lessonID);
+		    Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID"));
 			
-			portfolios = exportService.exportPortfolioForTeacher(lesson, cookies);
+			portfolios = exportService.exportPortfolioForTeacher(lessonID, cookies);
 		}
 		
 		request.setAttribute(PARAM_PORTFOLIO_LIST, portfolios);
 		
 		return mapping.findForward("displayPortfolio");
 	}
+	
+
 }