From c8d86470f1b00fb73c893747ebc4d1543706e38a Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Tue, 22 Jul 2014 09:47:28 +0000 Subject: [PATCH] gwt logger commented (client side) and relevant print checks (system.out.println()) added in the code. gwt logger used in the server side. git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/databases-manager-portlet@98861 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/DatabasesManager.java | 16 +- .../client/panels/GxtBorderLayoutPanel.java | 83 ++++- .../client/panels/GxtTreePanel.java | 56 +++- .../server/GWTdbManagerServiceImpl.java | 285 +++++++++++------- .../databasesmanager/DatabasesManager.gwt.xml | 8 +- 5 files changed, 305 insertions(+), 143 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java index a750cc0..e275d82 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/DatabasesManager.java @@ -44,11 +44,13 @@ public class DatabasesManager implements EntryPoint { RootPanel.get(ConstantsPortlet.CONTENTDIV).add(borderLayout); Window.addResizeHandler(new ResizeHandler() { - // @Override + @Override public void onResize(ResizeEvent event) { - System.out.println("onWindowResized width: " - + event.getWidth() + " height: " - + event.getHeight()); + //print check +// System.out.println("onWindowResized width: " +// + event.getWidth() + " height: " +// + event.getHeight()); + updateSize(); } }); @@ -90,9 +92,9 @@ public class DatabasesManager implements EntryPoint { int rootWidth = Window.getClientWidth() - 2 * leftBorder; // - // rightScrollBar; - - System.out.println("New workspace dimension Height: " + rootHeight - + " Width: " + rootWidth); + //print check +// System.out.println("New workspace dimension Height: " + rootHeight +// + " Width: " + rootWidth); borderLayout.setHeight(rootHeight); borderLayout.setWidth(rootWidth); diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java index 43f3904..e10cea0 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtBorderLayoutPanel.java @@ -246,7 +246,8 @@ public class GxtBorderLayoutPanel extends ContentPanel { // System.out // .println("GxtBorderLayoutPanel: Event received"); - rootLogger.log(Level.SEVERE, "Event received"); + // rootLogger.log(Level.SEVERE, + // "SelectedItemEvent management"); // to get the selected item with its depth List data = treePanel.getTreePanel() @@ -259,7 +260,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { String text = selectedItem.getName(); - rootLogger.log(Level.INFO, "item selected: " + text); + // print check + System.out + .println("GxtBorderLayoutPanel--> selected item: " + + text); + + rootLogger.log(Level.INFO, "selected item: " + text); // toolbar.disableButtonOnToolbar(DepthSelectedItem, // treePanel.getSelectedItemIsSchema()); @@ -314,7 +320,7 @@ public class GxtBorderLayoutPanel extends ContentPanel { // System.out // .println("GxtBorderLayoutPanel: Event finished"); - rootLogger.log(Level.SEVERE, "Event finished"); + // rootLogger.log(Level.SEVERE, "Event finished"); } @@ -402,7 +408,12 @@ public class GxtBorderLayoutPanel extends ContentPanel { table.setTableDetailsDisplayed(false); } - rootLogger.log(Level.INFO, "the selected table is: " + // print check + System.out + .println("GxtBorderLayoutPanel--> selected table: " + + table.getName()); + + rootLogger.log(Level.INFO, "selected table: " + table.getName()); // get table details @@ -499,6 +510,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onFailure(Throwable caught) { // TODO Auto-generated method stub + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC LoadTables"); rootLogger.log(Level.SEVERE, "FAILURE RPC LoadTables"); @@ -536,6 +551,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onSuccess( PagingLoadResult result) { // TODO Auto-generated method stub + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC LoadTables"); rootLogger.log(Level.SEVERE, "SUCCESS RPC LoadTables"); @@ -625,7 +644,6 @@ public class GxtBorderLayoutPanel extends ContentPanel { // add the button cancel Button cancel = new Button("", Images.iconCancel()); cancel.setToolTip("Cancel"); - // add Buttons and TextField to the toolbar toolBarTop.add(searchTable); @@ -1126,6 +1144,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // Window.alert(caught.getMessage()); + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC submitQuery"); rootLogger.log(Level.SEVERE, "FAILURE RPC submitQuery"); @@ -1155,6 +1177,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { // TODO Auto-generated method stub + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC submitQuery"); rootLogger.log(Level.SEVERE, "SUCCESS RPC submitQuery"); @@ -1271,6 +1297,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // Window.alert(caught.getMessage()); + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC sample"); rootLogger.log(Level.SEVERE, "FAILURE RPC sample"); @@ -1285,6 +1315,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC sample"); rootLogger.log(Level.SEVERE, "SUCCESS RPC sample"); @@ -1394,6 +1428,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC smartSample"); + rootLogger.log(Level.SEVERE, "FAILURE RPC smartSample"); MessageBox.alert("Error ", @@ -1408,6 +1447,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { + //print check + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC smartSample"); + rootLogger.log(Level.SEVERE, "SUCCESS RPC smartSample"); rootLogger.log(Level.SEVERE, "output size: " + result.size()); @@ -1516,6 +1560,11 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC randomSample"); + rootLogger.log(Level.SEVERE, "FAILURE RPC randomSample"); MessageBox.alert("Error ", @@ -1529,6 +1578,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List result) { + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC randomSample"); rootLogger.log(Level.SEVERE, "SUCCESS RPC randomSample"); @@ -1576,11 +1629,17 @@ public class GxtBorderLayoutPanel extends ContentPanel { // Window.alert(caught.getMessage()); // System.out.println("FAILURE StartParse"); + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC parseResult"); + + rootLogger.log(Level.SEVERE, "FAILURE RPC parseResult"); MessageBox.alert("Error ", "
Message:" + caught.getMessage(), null); - rootLogger.log(Level.SEVERE, "FAILURE RPC parseResult"); + // if the submit query event has been performed the // dialog form is unmasked otherwise if a sampling @@ -1607,6 +1666,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { @Override public void onSuccess(List rows) { + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC parseResult"); rootLogger.log(Level.SEVERE, "SUCCESS RPC parseResult"); @@ -1962,6 +2025,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { public void onFailure(Throwable caught) { // TODO Auto-generated method // stub + + //print check + System.out + .println("GxtBorderLayoutPanel--> FAILURE RPC getTableDetails"); rootLogger.log(Level.SEVERE, "FAILURE RPC getTableDetails"); @@ -1980,6 +2047,10 @@ public class GxtBorderLayoutPanel extends ContentPanel { LinkedHashMap result) { // TODO Auto-generated method // stub + + //print check + System.out + .println("GxtBorderLayoutPanel--> SUCCESS RPC getTableDetails"); rootLogger.log(Level.SEVERE, "SUCCESS RPC getTableDetails"); diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java index 93c60b0..6abeb7c 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/client/panels/GxtTreePanel.java @@ -121,25 +121,25 @@ public class GxtTreePanel extends LayoutContainer { }; treePanel.setDisplayProperty("name"); - - // set icons in tree panel + + // set icons for elements in tree panel treePanel.setIconProvider(new ModelIconProvider() { - + @Override public AbstractImagePrototype getIcon(FileModel model) { // TODO Auto-generated method stub - - if (model.isDatabase()){ - + + if (model.isDatabase()) { // database + return Images.iconDatabase(); - + } - - if (model.isSchema()){ - + + if (model.isSchema()) { // schema + return Images.iconSchema(); } - + return null; } }); @@ -182,8 +182,12 @@ public class GxtTreePanel extends LayoutContainer { // System.out.println("GxtTreePanel Value: " // + data.get(0).get("name")); + // print check + System.out.println("GxtTreePanel--> selected item: " + + value); + rootLogger.log(Level.INFO, - "GxtTreePanel-> selectedItem value: " + value); + "GxtTreePanel-> selected item: " + value); // get the depth level treeDepthSelectedItem = store.getDepth(data.get(0)); @@ -309,8 +313,12 @@ public class GxtTreePanel extends LayoutContainer { FileModel selectedItem = (FileModel) (be.getNode() .getModel()); - rootLogger.log(Level.INFO, - "selected: " + selectedItem.getName()); + // print check + System.out.println("GxtTreePanel--> expanded item: " + + value); + + rootLogger.log(Level.INFO, "expanded item: " + + selectedItem.getName()); // select the expanded item treePanel.getSelectionModel() @@ -402,6 +410,9 @@ public class GxtTreePanel extends LayoutContainer { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); + // print check + System.out.println("GxtTreePanel--> FAILURE RPC getResource"); + rootLogger.log(Level.SEVERE, "FAILURE RPC getResource"); MessageBox.alert("Error ", @@ -416,6 +427,9 @@ public class GxtTreePanel extends LayoutContainer { @Override public void onSuccess(List result) { + // print check + System.out.println("GxtTreePanel--> SUCCESS RPC getResource"); + rootLogger.log(Level.SEVERE, "SUCCESS RPC getResource"); // print check @@ -459,6 +473,10 @@ public class GxtTreePanel extends LayoutContainer { // Window.alert(caught.getMessage()); // System.out.println("FAILURE"); + // print check + System.out + .println("GxtTreePanel--> FAILURE RPC getDBInfo"); + rootLogger.log(Level.SEVERE, "FAILURE RPC getDBInfo"); MessageBox.alert("Error ", @@ -475,6 +493,10 @@ public class GxtTreePanel extends LayoutContainer { public void onSuccess( LinkedHashMap result) { + // print check + System.out + .println("GxtTreePanel--> SUCCESS RPC getDBInfo"); + rootLogger.log(Level.SEVERE, "SUCCESS RPC getDBInfo"); if (result.size() != 0) { @@ -641,6 +663,9 @@ public class GxtTreePanel extends LayoutContainer { // rootLogger.log(Level.SEVERE, // "GxtTreePanel-> FAILURE RPC getDBSchema"); + // print check + System.out.println("GxtTreePanel--> FAILURE RPC getDBSchema"); + rootLogger.log(Level.SEVERE, "FAILURE RPC getDBSchema"); MessageBox.alert("Error ", @@ -654,6 +679,9 @@ public class GxtTreePanel extends LayoutContainer { @Override public void onSuccess(List result) { + + // print check + System.out.println("GxtTreePanel--> SUCCESS RPC getDBSchema"); rootLogger.log(Level.SEVERE, "SUCCESS RPC getDBSchema"); diff --git a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java index f8ac7d1..b00ab6e 100644 --- a/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/databasesmanager/server/GWTdbManagerServiceImpl.java @@ -56,17 +56,17 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements private LinkedHashMap outputMap; private LinkedHashMap outputKey; - - //the result generated in the LoadTables method + + // the result generated in the LoadTables method private List result = null; - //information about a database + // information about a database private String currentDB = ""; private String previousDB = ""; - //information about a schema - private String currentSchema=""; - private String previousSchema=""; - - //GWT logger + // information about a schema + private String currentSchema = ""; + private String previousSchema = ""; + + // GWT logger private static Logger rootLogger = Logger .getLogger("GWTdbManagerServiceImpl"); @@ -78,7 +78,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements List inputParameters = new ArrayList(); List outputParameters = new ArrayList(); - + // get list of algorithms List algorithms = new ArrayList(); algorithms = getDatabaseManagerAlgorithms(); @@ -92,8 +92,9 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements algorithmId = algorithms.get(i); + // print check // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } @@ -102,18 +103,21 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // get input parameters of the algorithm inputParameters = getParameters(algorithmId); + // print check // System.out.println("getting input parameters"); rootLogger.log(Level.SEVERE, "getting input parameters"); - for (int i = 0; i < inputParameters.size(); i++) { - - // System.out.println(inputParameters.get(i).getName()); - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - - } + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // + // } String computationId = startComputation(algorithmId, inputParameters); + //print check // retrieve data // System.out.println("output data retrieved"); rootLogger.log(Level.SEVERE, "output data retrieved"); @@ -149,8 +153,9 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements algorithmId = algorithms.get(i); + // print check // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } } @@ -158,17 +163,19 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements rootLogger.log(Level.SEVERE, "getting input parameters"); inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { - - // System.out.println(inputParameters.get(i).getName()); - inputParameters.get(i).setValue(resourceName); - - // rootLogger.log(Level.INFO, "ResourceName: " + resourceName); - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - } + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // inputParameters.get(i).setValue(resourceName); + // + // // rootLogger.log(Level.INFO, "ResourceName: " + resourceName); + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // } String computationId = startComputation(algorithmId, inputParameters); + ////print check // retrieve data // System.out.println("output data retrieved"); rootLogger.log(Level.SEVERE, "output data retrieved"); @@ -207,8 +214,9 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements algorithmId = algorithms.get(i); + // print check // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } } @@ -217,15 +225,17 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { - - // System.out.println(inputParameters.get(i).getName()); - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - } + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // } inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); + // print check rootLogger.log(Level.INFO, "ResourceName: " + dataInput.get("ResourceName")); @@ -234,6 +244,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); + //print check // retrieve data // System.out.println("output data retrieved"); rootLogger.log(Level.SEVERE, "output data retrieved"); @@ -268,20 +279,23 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements algorithmId = algorithms.get(i); + // print check // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } } // get input parameters of the algorithm rootLogger.log(Level.SEVERE, "getting input parameters"); + inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { - - // System.out.println(inputParameters.get(i).getName()); - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - } + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // } inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); @@ -296,10 +310,11 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); + //print check // retrieve data // System.out.println("output data retrieved"); rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); // System.out.println("size outputMap: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -323,7 +338,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements LinkedHashMap dataInput, boolean SearchTable, String keyword) throws Exception { - //check on a database + // check on a database currentDB = dataInput.get("DatabaseName"); if (!currentDB.equals(previousDB)) { result = null; @@ -331,16 +346,16 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements } previousDB = currentDB; - - //check on a schema - currentSchema=dataInput.get("SchemaName"); - if (!currentSchema.equals(previousSchema)){ + + // check on a schema + currentSchema = dataInput.get("SchemaName"); + if (!currentSchema.equals(previousSchema)) { result = null; System.gc(); } - - previousSchema=currentSchema; - + + previousSchema = currentSchema; + // get tables if (result == null) result = getTables(dataInput); @@ -361,13 +376,13 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements } int totalNumber = result.size(); - + if ((SearchTable == false) || keyword == null || keyword.length() == 0) { sublist = new ArrayList(result.subList(start, limit)); } else { - - rootLogger.log(Level.INFO, "searching the table"); - + // print check + // rootLogger.log(Level.INFO, "searching the table"); + // search the table for (int i = 0; i < result.size(); i++) { if ((result.get(i).getValue().toLowerCase()).startsWith(keyword @@ -375,12 +390,12 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements sublist.add(result.get(i)); } } - + limit = sublist.size(); int sublen = sublist.size(); totalNumber = sublen; - + if (start < sublen - 1) { limit = Math.min(sublen, limit); totalNumber = sublist.size(); @@ -388,11 +403,11 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements } } -// // print check -// rootLogger.log(Level.INFO, "result size: " + totalNumber); -// rootLogger.log(Level.INFO, "limit: " + limit); -// rootLogger.log(Level.INFO, "offset: " + config.getOffset()); -// rootLogger.log(Level.INFO, "start: " + start); + // // print check + // rootLogger.log(Level.INFO, "result size: " + totalNumber); + // rootLogger.log(Level.INFO, "limit: " + limit); + // rootLogger.log(Level.INFO, "offset: " + config.getOffset()); + // rootLogger.log(Level.INFO, "start: " + start); loadResult = new BasePagingLoadResult(sublist, config.getOffset(), totalNumber); @@ -407,7 +422,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements boolean smartCorrectionQuery, String language) throws Exception { // System.out.println("language detected: " + language); - rootLogger.log(Level.SEVERE, "language used for query conversion: " + rootLogger.log(Level.SEVERE, "Dialect used for smart correction:: " + language); List inputParameters = new ArrayList(); @@ -425,8 +440,9 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements if (algorithms.get(i).equals("SUBMITQUERY")) { algorithmId = algorithms.get(i); + // print check // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } } @@ -435,19 +451,22 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - //print check - for (int i = 0; i < inputParameters.size(); i++) { - // System.out.println(inputParameters.get(i).getName()); - // System.out.println(inputParameters.get(i).getDefaultValue()); - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - } + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // // System.out.println(inputParameters.get(i).getName()); + // // System.out.println(inputParameters.get(i).getDefaultValue()); + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // } inputParameters.get(0).setValue(dataDB.get("ResourceName")); inputParameters.get(1).setValue(dataDB.get("DatabaseName")); + // print check rootLogger .log(Level.INFO, "ResourceName " + dataDB.get("ResourceName")); rootLogger.log(Level.INFO, "DatabaseName" + dataDB.get("DatabaseName")); + rootLogger.log(Level.INFO, "Query" + query); + rootLogger.log(Level.INFO, "SmartCorrections check:" + smartCorrectionQuery); inputParameters.get(2).setValue(String.valueOf(valueReadOnlyQuery)); inputParameters.get(3).setValue(String.valueOf(smartCorrectionQuery)); @@ -459,12 +478,13 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // + outputMap.size()); String computationId = startComputation(algorithmId, inputParameters); + //print check // retrieve data // System.out.println("output data retrieved"); // System.out.println("size outputMap: " + outputMap.size()); rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -511,7 +531,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // print check + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } @@ -523,13 +544,22 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // + // } - // System.out.println(inputParameters.get(i).getName()); - - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - - } + // print check + rootLogger.log(Level.INFO, + "ResourceName " + dataInput.get("ResourceName")); + rootLogger.log(Level.INFO, + "DatabaseName " + dataInput.get("DatabaseName")); + rootLogger.log(Level.INFO, "SchemaName " + dataInput.get("SchemaName")); + rootLogger.log(Level.INFO, "TableName " + dataInput.get("TableName")); inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); @@ -542,13 +572,12 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); // retrieve data - // System.out.println("output data retrieved"); - // System.out.println("size outputMap: " + outputMap.size()); + // print check rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -589,7 +618,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // print check + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } @@ -601,13 +631,22 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // + // } - // System.out.println(inputParameters.get(i).getName()); - - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - - } + // print check + rootLogger.log(Level.INFO, + "ResourceName " + dataInput.get("ResourceName")); + rootLogger.log(Level.INFO, + "DatabaseName " + dataInput.get("DatabaseName")); + rootLogger.log(Level.INFO, "SchemaName " + dataInput.get("SchemaName")); + rootLogger.log(Level.INFO, "TableName " + dataInput.get("TableName")); inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); @@ -620,13 +659,12 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); // retrieve data - // System.out.println("output data retrieved"); - // System.out.println("size outputMap: " + outputMap.size()); + // print check rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -668,7 +706,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // print check + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } @@ -680,13 +719,22 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // + // } - // System.out.println(inputParameters.get(i).getName()); - - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - - } + // print check + rootLogger.log(Level.INFO, + "ResourceName " + dataInput.get("ResourceName")); + rootLogger.log(Level.INFO, + "DatabaseName " + dataInput.get("DatabaseName")); + rootLogger.log(Level.INFO, "SchemaName " + dataInput.get("SchemaName")); + rootLogger.log(Level.INFO, "TableName " + dataInput.get("TableName")); inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); @@ -699,13 +747,12 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); // retrieve data - // System.out.println("output data retrieved"); - // System.out.println("size outputMap: " + outputMap.size()); + // print check rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -746,7 +793,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("algorithmId: " + algorithmId); - rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); + // print check + // rootLogger.log(Level.SEVERE, "algorithmId: " + algorithmId); } @@ -758,13 +806,23 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements inputParameters = getParameters(algorithmId); - for (int i = 0; i < inputParameters.size(); i++) { + // print check + // for (int i = 0; i < inputParameters.size(); i++) { + // + // // System.out.println(inputParameters.get(i).getName()); + // + // rootLogger.log(Level.INFO, inputParameters.get(i).getName()); + // + // } - // System.out.println(inputParameters.get(i).getName()); - - rootLogger.log(Level.INFO, inputParameters.get(i).getName()); - - } + // print check + rootLogger.log(Level.INFO, + "ResourceName " + dataInput.get("ResourceName")); + rootLogger.log(Level.INFO, + "DatabaseName " + dataInput.get("DatabaseName")); + rootLogger.log(Level.INFO, "SchemaName " + dataInput.get("SchemaName")); + rootLogger.log(Level.INFO, "TableName " + dataInput.get("TableName")); + inputParameters.get(0).setValue(dataInput.get("ResourceName")); inputParameters.get(1).setValue(dataInput.get("DatabaseName")); @@ -777,13 +835,12 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements String computationId = startComputation(algorithmId, inputParameters); // retrieve data - // System.out.println("output data retrieved"); - // System.out.println("size outputMap: " + outputMap.size()); + //print check rootLogger.log(Level.SEVERE, "output data retrieved"); - rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); +// rootLogger.log(Level.SEVERE, "output data size: " + outputMap.size()); for (int i = 0; i < outputMap.size(); i++) { @@ -808,6 +865,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements } + //parse a csv row public List parseCVSString(List result, List attrNames) throws Exception { @@ -822,7 +880,7 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements Row element = new Row(attrNames, attrValues, i); rows.add(element); - + } } @@ -1096,15 +1154,17 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("GWTdbManagerServiceImpl-> SM resource ID: " // + smResource.resourceId()); - rootLogger.log(Level.SEVERE, - "SM resource ID: " + smResource.resourceId()); + // print check + // rootLogger.log(Level.SEVERE, + // "SM resource ID: " + smResource.resourceId()); // System.out // .println("GWTdbManagerServiceImpl-> SM resource Description: " // + smResource.description()); - rootLogger.log(Level.SEVERE, "SM resource Description: " - + smResource.description()); + // print check + // rootLogger.log(Level.SEVERE, "SM resource Description: " + // + smResource.description()); percentage = 100; @@ -1118,7 +1178,8 @@ public class GWTdbManagerServiceImpl extends RemoteServiceServlet implements // System.out.println("displayOutput"); - rootLogger.log(Level.SEVERE, "displayOutput"); + // print check + // rootLogger.log(Level.SEVERE, "displayOutput"); outputMap = new LinkedHashMap(); diff --git a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml index 0eb7860..51b719a 100644 --- a/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/databasesmanager/DatabasesManager.gwt.xml @@ -5,7 +5,7 @@ - + @@ -27,8 +27,8 @@ - - - + + +