Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	(.../QaAppConstants.java)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -71,6 +71,7 @@
 	
 	public static final String IS_MONITORED_CONTENT_IN_USE				="isMonitoredContentInUse";
 	public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY		="loadMonitoringEditActivity";
+	public static final String IS_PORTFOLIO_EXPORT						="isPortfolioExport";
 			
     public static final Long INITIAL_QUESTION_COUNT		=new Long(1);
     
@@ -82,6 +83,7 @@
     public static final String LOAD_STARTER								="starter";
     public static final String IS_DEFINE_LATER							="isDefineLater";
     public static final String LEARNING_MODE							="learningMode";
+    public static final String PORTFOLIO_EXPORT_MODE					="portfolioExportMode";
     
     /*
      * authoring mode controllers
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
===================================================================
diff -u
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	(revision 0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -0,0 +1,150 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.tool.qa.web;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.tool.ToolAccessMode;
+import org.lamsfoundation.lams.tool.qa.QaAppConstants;
+import org.lamsfoundation.lams.tool.qa.QaApplicationException;
+import org.lamsfoundation.lams.tool.qa.QaContent;
+import org.lamsfoundation.lams.tool.qa.QaQueUsr;
+import org.lamsfoundation.lams.tool.qa.QaSession;
+import org.lamsfoundation.lams.tool.qa.service.IQaService;
+import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
+/**
+ * <p> Enables exporting portfolio for teacher and learner modes. </p> 
+ * 
+ * @author Ozgur Demirtas
+ */
+
+public class ExportServlet  extends AbstractExportPortfolioServlet implements QaAppConstants{
+	static Logger logger = Logger.getLogger(ExportServlet.class.getName());
+	private static final long serialVersionUID = -4529093489007108143L;
+	private final String FILENAME = "qa_main.html";
+	
+	
+	public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+	{
+	    logger.debug("dispathcing doExport");
+	    request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(true).toString());
+	    String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
+
+		if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){
+		    learner(request,response,directoryName,cookies);
+		}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
+			teacher(request,response,directoryName,cookies);
+		}
+
+		writeResponseToFile(basePath+"/export/exportportfolio.jsp",directoryName,FILENAME,cookies);
+		
+		return FILENAME;
+	}
+    
+	public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+	    logger.debug("starting learner mode...");
+	    request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner");
+        
+    	IQaService qaService = QaServiceProxy.getQaService(getServletContext());
+        
+    	logger.debug("userID:" + userID);
+    	logger.debug("toolSessionID:" + toolSessionID);
+    	
+        if (userID == null || toolSessionID == null)
+        {
+            String error = "Tool session Id or user Id is null. Unable to continue";
+            logger.error(error);
+            throw new QaApplicationException(error);
+        }
+        
+        QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionID.longValue());
+        
+        QaQueUsr learner = qaService.getQaUserBySession(userID,qaSession.getUid());
+        logger.debug("learner: " + learner);
+        
+        if (learner == null)
+        {
+            String error="The user with user id " + userID + " does not exist in this session or session may not exist.";
+            logger.error(error);
+            throw new QaApplicationException(error);
+        }
+        
+        QaContent content=qaSession.getQaContent();
+        logger.debug("content: " + content);
+        logger.debug("content id: " + content.getQaContentId());
+        
+        if (content == null)
+        {
+            String error="The content for this activity has not been defined yet.";
+            logger.error(error);
+            throw new QaApplicationException(error);
+        }
+
+        logger.debug("calling learning mode toolSessionID:" + toolSessionID + " userID: " + userID );
+    	QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+    	//voteMonitoringAction.refreshSummaryData(request, content, voteService, true, true, toolSessionID.toString(), userID.toString() , true);
+    	
+    	logger.debug("ending learner mode: ");
+    }
+    
+    public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
+    {
+        logger.debug("starting teacher mode...");
+        request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher");
+        
+        IQaService qaService = QaServiceProxy.getQaService(getServletContext());
+       
+        if (toolContentID==null)
+        {
+            String error="Tool Content Id is missing. Unable to continue";
+            logger.error(error);
+            throw new QaApplicationException(error);
+        }
+
+        QaContent content=qaService.loadQa(toolContentID.longValue());
+        logger.debug("content: " + content);
+        
+        if (content == null)
+        {
+            String error="Data is missing from the database. Unable to Continue";
+            logger.error(error);
+            throw new QaApplicationException(error);
+        }
+		
+        QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+        logger.debug("starting refreshSummaryData.");
+        //voteMonitoringAction.refreshSummaryData(request, content, voteService, true, false, null, null, false);
+        
+        logger.debug("teacher uses content id: " + content.getQaContentId());
+        logger.debug("ending teacher mode: ");
+    }
+
+}
Fisheye: Tag af3906ba75d798954fca027bea336bb842d8b976 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/web.xml
===================================================================
diff -u -r79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision 79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb)
+++ lams_tool_laqa/web/WEB-INF/web.xml	(.../web.xml)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -111,8 +111,9 @@
 	
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.qa.web.QaExportServlet</servlet-class>
+		<servlet-class>org.lamsfoundation.lams.tool.qa.web.ExportServlet</servlet-class>
 	</servlet>
+	
 
 <!--  FCKEditor Connector Configuration -->
 	<servlet>
@@ -141,9 +142,10 @@
 
   	<servlet-mapping>
 		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
+		<url-pattern>/exportPortfolio/*</url-pattern>
   	</servlet-mapping>
 
+
 	<servlet-mapping>
 	    <servlet-name>Connector</servlet-name>
 	    <url-pattern>/fckeditor/editor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r1453bf6403ce02c29d691fe34e65a049d3285c26 -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 1453bf6403ce02c29d691fe34e65a049d3285c26)
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -168,8 +168,7 @@
 		<!-- end of content (Basic) -->
 	</c:if> 			
 	
-
-	<lams:HTMLEditor/>	
 	</html:form>
+	<lams:HTMLEditor/>	
 </body>
 </html:html>
Index: lams_tool_laqa/web/export/ExportContent.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/export/ExportContent.jsp	(revision 0)
+++ lams_tool_laqa/web/export/ExportContent.jsp	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -0,0 +1,35 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+ 				
+Export Content goes here
\ No newline at end of file
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/export/exportportfolio.jsp	(revision 0)
+++ lams_tool_laqa/web/export/exportportfolio.jsp	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -0,0 +1,65 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+	<html:html locale="true">
+	<head>
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+	<title> <bean:message key="label.exportPortfolio"/> </title>
+	
+	 <lams:css localLink="true" />
+	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
+
+ 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
+    <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
+    <script type="text/javascript" src="${lams}includes/javascript/fckcontroller.js"></script>
+    <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
+
+	<script language="JavaScript" type="text/JavaScript">
+    	var imgRoot="${lams}images/";
+	    var themeName="aqua";
+	</script>
+	
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/tabcontroller.js"></script>    
+	<script type="text/javascript" src="<c:out value="${lams}"/>includes/javascript/common.js"></script>
+	
+	</head>
+	<body>
+		export portfolio content goes here
+	
+	</body>
+</html:html>
+
+
+
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -18,7 +18,7 @@
 
   http://www.gnu.org/licenses/gpl.txt
 --%>
-
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-bean" prefix="bean"%> 
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-logic" prefix="logic" %>
@@ -31,11 +31,8 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-
 <html:html locale="true">
 <head>
-	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<jsp:include page="/learning/learningHeader.jsp" />
 	
 	<script language="JavaScript" type="text/JavaScript">
Index: lams_tool_laqa/web/learning/learningHeader.jsp
===================================================================
diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/web/learning/learningHeader.jsp	(.../learningHeader.jsp)	(revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a)
+++ lams_tool_laqa/web/learning/learningHeader.jsp	(.../learningHeader.jsp)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -29,7 +29,7 @@
 
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
-
+	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 	<title> <bean:message key="label.learning.qa"/> </title>
 	 <lams:css/>
 	<!-- depending on user / site preference this will get changed probably use passed in variable from flash to select which one to use-->
Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r35b9d9a191a324d1437ef51181c8ab8f12e2d6d7 -raf3906ba75d798954fca027bea336bb842d8b976
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 35b9d9a191a324d1437ef51181c8ab8f12e2d6d7)
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision af3906ba75d798954fca027bea336bb842d8b976)
@@ -151,7 +151,7 @@
 		<lams:TabBody id="2" titleKey="label.instructions" page="Instructions.jsp" />
 		<lams:TabBody id="3" titleKey="label.editActivity" page="Edit.jsp" />
 		<lams:TabBody id="4" titleKey="label.stats" page="Stats.jsp" />
-	<lams:HTMLEditor/>	
 	</html:form>
+	<lams:HTMLEditor/>		
 </body>
 </html:html>