From a39e4724acab6ce76fb2a7033d14c597f5a3b389 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 26 Mar 2021 10:14:06 +0100 Subject: [PATCH] updated getBreadcrumbToParentLimit --- .../server/WorkspaceExplorerServiceImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/WorkspaceExplorerServiceImpl.java b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/WorkspaceExplorerServiceImpl.java index 7bbce1d..16643aa 100644 --- a/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/WorkspaceExplorerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/wsexplorer/server/WorkspaceExplorerServiceImpl.java @@ -241,7 +241,8 @@ public class WorkspaceExplorerServiceImpl extends RemoteServiceServlet implement public ArrayList getBreadcrumbsByItemIdentifier( String itemIdentifier, String itemName, boolean includeItemAsParent) throws Exception { - System.out.println("ListParents By Item id "+ itemIdentifier + " name="+itemName); + _log.debug("called getBreadcrumbsByItemIdentifier id="+ itemIdentifier + ", name="+itemName); + try { List parents = StorageHubServiceUtil.getParents(getThreadLocalRequest(), itemIdentifier); ArrayList toReturn = new ArrayList<>(parents.size()); @@ -262,6 +263,7 @@ public class WorkspaceExplorerServiceImpl extends RemoteServiceServlet implement String theClickedFolderName = itemName == null || itemName.equals("") ? "current folder" : itemName; toReturn.add(new org.gcube.portlets.widgets.wsexplorer.shared.Item(itemIdentifier, theClickedFolderName, true)); //this is the last non clickable item on the BC + _log.debug("returning breadcrumbs: "+ toReturn); return toReturn; } catch (Exception e) { _log.error("Error in get List Parents By Item Identifier ", e); @@ -280,8 +282,13 @@ public class WorkspaceExplorerServiceImpl extends RemoteServiceServlet implement */ @Override public List getBreadcrumbsByItemIdentifierToParentLimit(String itemIdentifier, String parentLimit, boolean includeItemAsParent) throws Exception { - _log.trace("getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier " + itemIdentifier +" and limit: "+parentLimit); + _log.debug("getBreadcrumbsByItemIdentifierToParentLimit by Item Identifier: " + itemIdentifier +" and limit: "+parentLimit); + if(parentLimit==null) { + _log.debug("parentLimit is null, so calling default getBreadcrumbsByItemIdentifier"); + return getBreadcrumbsByItemIdentifier(itemIdentifier, null, includeItemAsParent); + } + parentLimit = parentLimit!=null?parentLimit:""; try { List parents = StorageHubServiceUtil.getParents(getThreadLocalRequest(), itemIdentifier); @@ -314,6 +321,7 @@ public class WorkspaceExplorerServiceImpl extends RemoteServiceServlet implement if (found) toReturn.add(item); } + _log.debug("returning breadcrumb untit to folder: "+ toReturn); return toReturn; } catch (Exception e) { _log.error("Error in get List Parents By Item Identifier ", e);