Index: lams_learning/web/exportWaitingPage.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/exportWaitingPage.jsp 20 Oct 2005 05:42:49 -0000 1.1 +++ lams_learning/web/exportWaitingPage.jsp 21 Oct 2005 06:06:32 -0000 1.2 @@ -20,10 +20,12 @@ --%> <%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> + <% String protocol = request.getProtocol(); if(protocol.startsWith("HTTPS")){ @@ -76,6 +78,7 @@ updateindicator = updateindicator+"... "; var ready=req.readyState; + var msg; if (ready==READY_STATE_COMPLETE){ @@ -86,10 +89,12 @@ window.location.href = url; break; case 404: //status 404 Not Found - alert("The export download page cannot be found"); + msg = ""; + alert(msg); break; case 500: //status 500 Internal Server Error - alert("A problem has occurred. Could not generate portfolio"); + msg = ""; + document.getElementById("message").innerHTML = msg; break; }