Index: lams_learning/web/exportWaitingPage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v
diff -u -r1.17 -r1.18
--- lams_learning/web/exportWaitingPage.jsp	5 Mar 2008 07:30:06 -0000	1.17
+++ lams_learning/web/exportWaitingPage.jsp	19 May 2008 06:45:36 -0000	1.18
@@ -88,13 +88,13 @@
 			
 			var ready=req.readyState;
 			var msg;
-		
+
 			if (ready==READY_STATE_COMPLETE){
-			
+			 
 				switch (req.status)
 				{
 					case 200: // status 200 OK
-						var url = "<lams:WebAppURL/>exportDownload?fileLocation="+req.responseText;
+						var url = "<lams:LAMSURL/>learning/exportDownload?fileLocation="+req.responseText;
 
 						downloadStarted = new Boolean(true);
 						msg = "<p><fmt:message key='export.portfolio.generation.complete.message'/></p>\n"
@@ -124,8 +124,11 @@
 		}
 		
 		window.onload=function(){
-			sendRequest("<lams:WebAppURL/>portfolioExport?<c:out value="${pageContext.request.queryString}" escapeXml="false"/>");
+			// Safari is really picky about cross domain calls - if the server URL doesn't specify a port, then we mustn't
+			// specify a port here, and lams:WebAppURL always specifies the port.
+			sendRequest("<lams:LAMSURL/>learning/portfolioExport?<c:out value="${pageContext.request.queryString}" escapeXml="false"/>");
 		}  
+		
 	</script>
       <!--
     <link rel="stylesheet" type="text/css" href="styles.css">