From f221d8eb98bbd3d7ee209535e8cc75eb8e2d2635 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Wed, 17 Jan 2018 17:00:50 +0000 Subject: [PATCH] ref 10705: Add user name to algorithms descriptions in SAI publication https://support.d4science.org/issues/10705 Added git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/statistical-algorithms-importer@162284 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../server/generator/AlgorithmGenerator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java index c816635..b63a622 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java @@ -286,39 +286,39 @@ public class AlgorithmGenerator { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + "[Published by " + serviceCredentials.getFullName() + "(" + + " [Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + "[Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + "[Published by " + serviceCredentials.getFullName() + " on " + + " [Published by " + serviceCredentials.getFullName() + " on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + "[Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } } } else { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = "[Published by " + serviceCredentials.getFullName() + "(" + algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } else { - algorithmDescription = "[Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = "[Published by " + serviceCredentials.getFullName() + " on " + algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } else { - algorithmDescription = "[Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; } } }