Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java,v
diff -u -r1.6 -r1.7
--- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java	10 Oct 2006 05:43:51 -0000	1.6
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java	9 May 2007 11:34:37 -0000	1.7
@@ -158,26 +158,26 @@
 	            if ( extension.equalsIgnoreCase(".las") ) {
 	            	// process 1.0.x file.
 	            	String wddxPacket = getPacket(file.getInputStream());
-		            IExportToolContentService service = getExportService();
-		            ldId = service.importLearningDesign102(wddxPacket,user,workspaceFolderUid,toolsErrorMsgs);
+	            	if ( wddxPacket == null || ! ( wddxPacket.startsWith("<wddx") || wddxPacket.startsWith("<?xml")) ) {
+		            	badFileType(ldErrorMsgs, filename,"Not a valid wddx/xml file");
+	            	} else {
+	            		IExportToolContentService service = getExportService();
+	            		ldId = service.importLearningDesign102(wddxPacket,user,workspaceFolderUid,toolsErrorMsgs);
+	            	}
 	            } else if ( extension.equalsIgnoreCase(".zip") ){
 		            // write the file
 		            String ldPath = ZipFileUtil.expandZip(file.getInputStream(),filename);
 		            IExportToolContentService service = getExportService();
 		            ldId = service.importLearningDesign(ldPath,user,workspaceFolderUid,toolsErrorMsgs);
 	            } else {
-	            	log.error("Uploaded file not an expected type. Filename was "+filename);
-	            	MessageService msgService = getMessageService(); 
-	            	String msg = msgService.getMessage(KEY_MSG_IMPORT_FILE_FORMAT);
-	            	ldErrorMsgs.add(msg != null ? msg : "Uploaded file not an expected type.");
+	            	badFileType(ldErrorMsgs, filename,"Unexpected extension");
 	            }
 
             }
             
         } catch (Exception e) {
-        	String msg = e.getMessage();
         	log.error("Error occured during import",e);
-        	ldErrorMsgs.add(e.getClass().getName());
+        	ldErrorMsgs.add(e.getClass().getName()+" "+e.getMessage());
 		}
         
         request.setAttribute(ATTR_LD_ID,ldId);
@@ -194,6 +194,14 @@
 
 
 	}
+
+
+	private void badFileType(List<String> ldErrorMsgs, String filename, String errDescription) {
+		log.error("Uploaded file not an expected type. Filename was "+filename+" "+errDescription);
+		MessageService msgService = getMessageService(); 
+		String msg = msgService.getMessage(KEY_MSG_IMPORT_FILE_FORMAT);
+		ldErrorMsgs.add(msg != null ? msg : "Uploaded file not an expected type.");
+	}
 	
 	//***************************************************************************************
 	// Private method
Index: lams_central/web/toolcontent/exportchoice.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/exportchoice.jsp,v
diff -u -r1.3 -r1.4
--- lams_central/web/toolcontent/exportchoice.jsp	16 Nov 2006 04:24:20 -0000	1.3
+++ lams_central/web/toolcontent/exportchoice.jsp	9 May 2007 11:34:37 -0000	1.4
@@ -38,8 +38,9 @@
 				<H2><fmt:message key="msg.export.choose.format.instruction" /></H2>
 				<table><tr><td>
 				<input type="radio" name="format" id="lams" value="1" checked="checked" class="noBorder"><fmt:message key="msg.export.choose.format.lams" />
-				<BR><BR>
+				<BR/><BR/>
 				<input type="radio" name="format" id="ims" value="2" class="noBorder"><fmt:message key="msg.export.choose.format.ims" />
+				<BR/><BR/>
 				<div class="right-buttons">
 					<a href="#" onclick="goDownload();" class="button"><fmt:message key="button.export" /></a>
 					<a href="javascript:;" onclick="closeWin();" class="button"><fmt:message key="button.close" /></a>
Index: lams_central/web/toolcontent/importresult.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/toolcontent/importresult.jsp,v
diff -u -r1.12 -r1.13
--- lams_central/web/toolcontent/importresult.jsp	16 Nov 2006 04:24:20 -0000	1.12
+++ lams_central/web/toolcontent/importresult.jsp	9 May 2007 11:34:37 -0000	1.13
@@ -32,7 +32,8 @@
 						<h2><fmt:message key="msg.import.success"/></h2>
 					</c:when>
 					<c:otherwise>
-						<h2><fmt:message key="msg.import.ld.success" /> <fmt:message key="msg.import.tool.error.prefix" /></h2>
+						<h2><fmt:message key="msg.import.ld.success" /></h2>
+						<h2><fmt:message key="msg.import.tool.error.prefix" /></h2>
 						<c:forEach var="toolError" items="${toolsErrorMessages}">
 							<p class="warning">${toolError}</p>
 						</c:forEach>
@@ -43,8 +44,11 @@
 			</c:when>
 			<c:otherwise>
 					<h2><fmt:message key="msg.import.failed" /></h2>
-					<div/>
-						<p class="warning"><fmt:message key="msg.reason.is" /> ${ldErrorMessages}</p>
+					<h2> <fmt:message key="msg.reason.is" /></h2>
+					<div>
+						<c:forEach var="ldError" items="${ldErrorMessages}">
+							<p class="warning"> ${ldError}</p>
+						</c:forEach>
 					</div>
 			</c:otherwise>
 		</c:choose>