Index: lams_common/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re43552eb705a10ca8c983ebb83e48527e1f0a61c -rb636ac0443171b69098dd1f9599bf2bd90c3ee42 --- lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e43552eb705a10ca8c983ebb83e48527e1f0a61c) +++ lams_common/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b636ac0443171b69098dd1f9599bf2bd90c3ee42) @@ -6,7 +6,7 @@ #=================== labels for LAMS Common =================# -msg.import.file.format =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. +msg.import.file.format =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format. import.shareresources.warning =The sequence contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors. validation.error.outputTransitionType1 =This activity has no output transition error.import.matching.tool.not.found =The activity with signature {0} is skipped because a matching tool cannot be found. Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re43552eb705a10ca8c983ebb83e48527e1f0a61c -rb636ac0443171b69098dd1f9599bf2bd90c3ee42 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e43552eb705a10ca8c983ebb83e48527e1f0a61c) +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b636ac0443171b69098dd1f9599bf2bd90c3ee42) @@ -6,7 +6,7 @@ #=================== labels for LAMS Common =================# -msg.import.file.format =The import file must be a .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. +msg.import.file.format =The import file must be a LAMS format .zip file exported from LAMS 2 or above, or a .las file exported from LAMS 1.0.2. You cannot import a design exported using the IMS Learning Design format. import.shareresources.warning =The sequence contains one or more Share Resources activities. Please check these activities as any file or uploaded websites in the activity will be invalid and will cause an error for the learners. Links to external websites should not cause any errors. validation.error.outputTransitionType1 =This activity has no output transition error.import.matching.tool.not.found =The activity with signature {0} is skipped because a matching tool cannot be found. Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -reb79a21f2f297559b5cf91266e21e75994033d3e -rb636ac0443171b69098dd1f9599bf2bd90c3ee42 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision eb79a21f2f297559b5cf91266e21e75994033d3e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision b636ac0443171b69098dd1f9599bf2bd90c3ee42) @@ -924,7 +924,12 @@ // String ldPath = ZipFileUtil.expandZip(file.getInputStream(),filename); String ldPath = ZipFileUtil.expandZip(new FileInputStream(designFile) ,filename); - ldId = importLearningDesignV2(ldPath,importer,workspaceFolderUid,toolsErrorMsgs); + File fullFilePath = new File(FileUtil.getFullPath(ldPath,LEARNING_DESIGN_FILE_NAME)); + if ( fullFilePath.canRead() ) { + ldId = importLearningDesignV2(ldPath,importer,workspaceFolderUid,toolsErrorMsgs); + } else { + badFileType(ldErrorMsgs, filename,"Learning design file not found."); + } } else { badFileType(ldErrorMsgs, filename,"Unexpected extension"); }