From 7107a2e0f59f88d0f9e16858836db801ad58fa4f Mon Sep 17 00:00:00 2001 From: francesco Date: Thu, 12 Mar 2020 10:29:04 +0100 Subject: [PATCH] Calling the SHUB search (instead of find) on searching by Workspace --- .../user/workspace/client/AppControllerExplorer.java | 5 +++-- .../user/workspace/server/GWTWorkspaceServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java index 76acb58..65d796e 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java @@ -118,6 +118,7 @@ import org.gcube.portlets.user.workspace.client.view.tree.AsyncTreePanel; import org.gcube.portlets.user.workspace.client.view.windows.DialogAddFolderAndSmart; import org.gcube.portlets.user.workspace.client.view.windows.DialogAddFolderAndSmart.AddType; import org.gcube.portlets.user.workspace.client.view.windows.DialogAddUrl; +import org.gcube.portlets.user.workspace.client.view.windows.DialogGetInfo; import org.gcube.portlets.user.workspace.client.view.windows.DialogGetLink; import org.gcube.portlets.user.workspace.client.view.windows.DialogGetLink.Link_Type; import org.gcube.portlets.user.workspace.client.view.windows.DialogInfoboot; @@ -690,8 +691,8 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt @Override public void onGetInfo(GetInfoEvent getInfoEvent) { - //new DialogGetInfo(getInfoEvent.getSourceFile()); - new DialogInfoboot(getInfoEvent.getSourceFile()); + new DialogGetInfo(getInfoEvent.getSourceFile()); + //new DialogInfoboot(getInfoEvent.getSourceFile()); } }); diff --git a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java index 6fe8a91..545e644 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java @@ -2423,8 +2423,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT folderId = workspace.getRoot().getId(); } - workspaceLogger.info("searching by name: " + text + " in the folder id: " + folderId); - List foundItems = workspace.find(text, folderId); + workspaceLogger.info("searching by text: " + text + " in the folder id: " + folderId); + List foundItems = workspace.search(text, folderId); if(foundItems==null) { workspaceLogger.info("Searching by SHUB returned null, instancing empty list"); @@ -2494,7 +2494,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT try { org.gcube.common.storagehubwrapper.server.tohl.Workspace workspace = getWorkspaceFromStorageHub(); - workspaceLogger.info("searching by name: " + itemName + " in the folder id: " + parentId); + workspaceLogger.info("finding by name: " + itemName + " in the folder id: " + parentId); List foundItems = workspace.find(itemName, parentId); if (foundItems == null || foundItems.isEmpty())