Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java,v diff -u -r1.13 -r1.14 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java 27 Apr 2007 02:14:48 -0000 1.13 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java 22 May 2007 06:06:51 -0000 1.14 @@ -46,7 +46,6 @@ public static final String SUBDIRECTORY_BASENAME = "Activity"; //subdirectory for each activity is ActivityXX where XX is the activity Id public static final String SUBDIRECTORY_NOTEBOOK_BASENAME = "Notebook"; public static final String PARAM_FILE_LOCATION = "fileLocation"; - public static final String URL_FOR_UNSUPPORTED_EXPORT = "learning/exportPortfolio/notSupported.jsp"; public static final String EXPORT_ERROR_FILENAME = "export_error.html"; public static final String EXPORT_ACTIVITY_ERROR_KEY = "error.export.portfolio.not.supported"; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java,v diff -u -r1.27 -r1.28 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java 4 May 2007 07:48:06 -0000 1.27 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java 22 May 2007 06:06:52 -0000 1.28 @@ -435,7 +435,9 @@ String filename = null; try { - filename = HttpUrlConnectionUtil.connectToToolExportURL(exportURL, cookies); + if ( exportURL != null ) { + filename = HttpUrlConnectionUtil.connectToToolExportURL(exportURL, cookies); + } if (filename == null) { filename = ExportPortfolioConstants.EXPORT_ERROR_FILENAME; Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java,v diff -u -r1.6 -r1.7 --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java 27 Sep 2006 04:24:36 -0000 1.6 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java 22 May 2007 06:06:52 -0000 1.7 @@ -205,11 +205,6 @@ } } - if ( exportUrlForTool == null ) { - exportUrlForTool = ExportPortfolioConstants.URL_FOR_UNSUPPORTED_EXPORT; - exportUrlForTool = WebUtil.appendParameterToURL(exportUrlForTool, "activityTitle", activity.getTitle()); - exportUrlForTool = WebUtil.appendParameterToURL(exportUrlForTool, "lessonName", lesson.getLessonName()); - } p.setExportUrl(exportUrlForTool); currentPortfolioList.add(p); Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_learning/web/exportPortfolio/notSupported.jsp'. Fisheye: No comparison available. Pass `N' to diff?