From 59dee8d2d652006583d26075055b8b66342e0599 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 14 Dec 2018 13:24:59 +0000 Subject: [PATCH] ref 12977: SAI - Force the path of the project folder to be updated to a new format https://support.d4science.org/issues/12977 Now, when the project is open the path is forced to be updated git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@174893 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/generator/ProjectBuilder.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/ProjectBuilder.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/ProjectBuilder.java index 2eb58fd..53fba44 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/ProjectBuilder.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/ProjectBuilder.java @@ -221,18 +221,24 @@ public class ProjectBuilder { logger.debug("Create Backup of PackageProject"); backupFolderId = createBackupFolder(); if (backupFolderId != null && !backupFolderId.isEmpty()) { - FilesStorage filesStorage = new FilesStorage(); + try { + FilesStorage filesStorage = new FilesStorage(); - GregorianCalendar now = new GregorianCalendar(); + GregorianCalendar now = new GregorianCalendar(); - String packageProjectNewName = project.getInputData().getProjectInfo().getAlgorithmNameToClassName() - + "_backup_" + sdf.format(now.getTime()) + PROJECT_PACKAGE_EXTENTION; + String packageProjectNewName = project.getInputData().getProjectInfo().getAlgorithmNameToClassName() + + "_backup_" + sdf.format(now.getTime()) + PROJECT_PACKAGE_EXTENTION; - filesStorage.copyItemOnFolderWithNewName(serviceCredentials.getUserName(), - project.getProjectTarget().getProjectDeploy().getPackageProject().getId(), backupFolderId, - packageProjectNewName); + filesStorage.copyItemOnFolderWithNewName(serviceCredentials.getUserName(), + project.getProjectTarget().getProjectDeploy().getPackageProject().getId(), backupFolderId, + packageProjectNewName); + + } catch (Throwable e) { + logger.error("Error in backup: " + e.getLocalizedMessage(), e); + logger.info("Backup skipped"); + } } else { - logger.debug("BackupFolderId is null, backup not done"); + logger.debug("BackupFolderId is null, the backup is not done"); } } else { logger.debug("First deploy, no backup needed"); @@ -526,6 +532,7 @@ public class ProjectBuilder { if (backupFolder != null && backupFolder.getId() != null && !backupFolder.getId().isEmpty()) { backupFolderId = backupFolder.getId(); } else { + logger.debug("Create new BackupFolder"); ItemDescription newBackupFolder = filesStorage.createFolder(serviceCredentials.getUserName(), project.getProjectFolder().getFolder().getId(), STATISTICAL_ALGORITHM_BACKUP_FOLDER_NAME, STATISTICAL_ALGORITHM_BACKUP_FOLDER_DESCRIPTION);