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.6 -r1.7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	31 Oct 2005 05:24:56 -0000	1.6
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java	7 Dec 2005 00:39:52 -0000	1.7
@@ -36,6 +36,7 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.learning.export.Portfolio;
+import org.lamsfoundation.lams.learning.export.ToolPortfolio;
 import org.lamsfoundation.lams.learning.export.ExportPortfolioException;
 import org.lamsfoundation.lams.learning.export.service.IExportPortfolioService;
 import org.lamsfoundation.lams.learning.export.service.ExportPortfolioServiceProxy;
@@ -76,7 +77,8 @@
 						            HttpServletRequest request,
 						            HttpServletResponse response) throws ExportPortfolioException
 	{
-		Portfolio[] portfolios = null;
+		//ToolPortfolio[] portfolios = null;
+	   Portfolio portfolio = null;
 		String mode = WebUtil.readStrParam(request, AttributeNames.PARAM_MODE);
 		IExportPortfolioService exportService = ExportPortfolioServiceProxy.getExportPortfolioService(getServlet().getServletContext());
 		
@@ -91,18 +93,18 @@
 		    Integer userId = userDto.getUserID();
 		    
 		    Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
-		    portfolios = exportService.exportPortfolioForStudent(userId, lessonID, true, cookies);
+		    portfolio = 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"));
 			
-			portfolios = exportService.exportPortfolioForTeacher(lessonID, cookies);
+			portfolio = exportService.exportPortfolioForTeacher(lessonID, cookies);
 		}
 		
-		request.setAttribute(PARAM_PORTFOLIO_LIST, portfolios);
+		request.setAttribute(PARAM_PORTFOLIO_LIST, portfolio.getToolPortfolios());
 		
 		return mapping.findForward("displayPortfolio");
 	}