SAK-48104 Samigo add logic to help detect the qti filename when importing a zip (sakaiproject#11040)

Author: jesusmmp

samigo/samigo-app/src/webapp/jsf/qti/xmlDisplay.jsp

@@ -4,7 +4,7 @@
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <% response.setHeader("Cache-Control", "private"); %>
 <% response.setHeader("Pragma", "cache"); %>
-<% response.setHeader("Content-Disposition", "attachment; filename=exported-assessment.xml"); %>
+<% response.setHeader("Content-Disposition", "attachment; filename=exportAssessment.xml"); %>
 
 <%--
 ***********************************************************************************

samigo/samigo-cp/src/java/org/sakaiproject/tool/assessment/contentpackaging/ImportService.java

@@ -79,7 +79,7 @@ public String unzipImportFile(String filename) {
 	    	if (!dir.exists()) {
 	    		if (!dir.mkdirs()) {
                     log.warn("Unable to mkdir {}", dir.getPath());
-                }
+	    		}
 	    	}
 
 	    	Set<String> dirsMade = new TreeSet<>();
@@ -90,19 +90,19 @@ public String unzipImportFile(String filename) {
 	    		qtiFilename = "exportAssessment.xml";
 	    		List<String> xmlFilenames = new ArrayList<>();
 	    		while (entry != null) {
-                    String entryName = entry.getName();
-                    String entryNameTrimmed = entryName.trim();
-                    int ix = entryName.lastIndexOf('/');
-                    if (ix > 0) {
-                        String dirName = entryName.substring(0, ix);
-                        if (!dirsMade.contains(dirName)) {
+	    			String entryName = entry.getName();
+	    			String entryNameTrimmed = entryName.trim();
+	    			int ix = entryName.lastIndexOf('/');
+	    			if (ix > 0) {
+	    				String dirName = entryName.substring(0, ix);
+	    				if (!dirsMade.contains(dirName)) {
 	    					File d = new File(dir.getPath() + "/" + dirName);
 	    					// If it already exists as a dir, don't do anything
 	    					if (!(d.exists() && d.isDirectory())) {
 	    						// Try to create the directory, warn if it fails
 	    						if (!d.mkdirs()) {
-                                    log.warn("Unable to mkdir {}/{}", dir.getPath(), dirName);
-                                }
+	    							log.warn("unable to mkdir {}/{}", dir.getPath(), dirName);
+	    						}
 	    						dirsMade.add(dirName);
 	    					}
 	    				}
@@ -131,25 +131,27 @@ public String unzipImportFile(String filename) {
 	    					NamedNodeMap namedNodeMap = fstNode.getAttributes();
 	    					qtiFilename = namedNodeMap.getNamedItem("href").getNodeValue();
 	    				} catch (Exception e) {
-							log.warn("Could not parse imsmanifest.xml: {}", e.toString());
+	    					log.warn("Could not parse imsmanifest.xml: {}", e.toString());
+	    				}
+	    			} else if (entryNameTrimmed.endsWith(".xml")) {
+	    				xmlFilenames.add(entryNameTrimmed);
+	    				// If the QTI file doesn't exist in the zip,
+	    				// we guess the name might be either exportAssessment.xml or the same as the zip or other
+	    				// file name
+	    				if (!xmlFilenames.contains(qtiFilename.trim())) {
+	    					if (xmlFilenames.contains("exportAssessment.xml")) {
+	    						qtiFilename = "exportAssessment.xml";
+	    					} else if (xmlFilenames.contains(tmpName.substring(0, tmpName.lastIndexOf("_")) + ".xml")) {
+	    						qtiFilename = tmpName.substring(0, tmpName.lastIndexOf("_")) + ".xml";
+	    					} else {
+	    						qtiFilename = entryNameTrimmed;
+	    					}
 	    				}
-                    } else if (entryNameTrimmed.endsWith(".xml")) {
-                        xmlFilenames.add(entryNameTrimmed);
 	    			}
 
 	    			zipStream.closeEntry();
 	    			entry = zipStream.getNextEntry();
 	    		}
-	    		// If the QTI file doesn't exist in the zip,
-	    		// we guess the name might be either exportAssessment.xml or the same as the zip
-	    		// file name
-	    		if (!xmlFilenames.contains(qtiFilename.trim())) {
-	    			if (xmlFilenames.contains("exportAssessment.xml")) {
-	    				qtiFilename = "exportAssessment.xml";
-	    			} else {
-	    				qtiFilename = tmpName.substring(0, tmpName.lastIndexOf("_")) + ".xml";
-	    			}
-	    		}
 	    	}
 	    } catch (IOException e) {
 	    	log.warn(e.toString());
@@ -165,4 +167,5 @@ public String getQtiFilename() {
 	public void setQtiFilename(String qtiFilename) {
 		this.qtiFilename = qtiFilename;
 	}
+	
 }