From ee8bffb3dd746f040716101fea6864285c3a1480 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Mon, 16 Jun 2014 12:30:45 +0000 Subject: [PATCH] inserted others log to job util git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@97459 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../TaxonomyWindowInfoJobsSpecies.java | 4 ++++ .../server/job/TaxonomyJobUtil.java | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyWindowInfoJobsSpecies.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyWindowInfoJobsSpecies.java index 83532a6..14d631b 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyWindowInfoJobsSpecies.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/job/taxonomy/TaxonomyWindowInfoJobsSpecies.java @@ -8,6 +8,7 @@ import com.extjs.gxt.ui.client.data.ModelData; import com.extjs.gxt.ui.client.store.GroupingStore; import com.extjs.gxt.ui.client.widget.Window; import com.extjs.gxt.ui.client.widget.layout.FitLayout; +import com.google.gwt.core.shared.GWT; public class TaxonomyWindowInfoJobsSpecies extends Window{ @@ -34,6 +35,9 @@ public class TaxonomyWindowInfoJobsSpecies extends Window{ // System.out.println("jobModel.getId " + jobModel.getIdentifier() + " children num: " +jobModel.getListChildStatus().size()); + +// GWT.log("taxonomy job: "+jobModel); + for (JobTaxonomyModel childJob : jobModel.getListChildStatus()) { BaseModelData data = new BaseModelData(); data.set(TaxonomyJobInfoFields.NAME.getId(), childJob.getName()); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java index e8c6bbf..027d5c0 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/job/TaxonomyJobUtil.java @@ -43,28 +43,34 @@ public class TaxonomyJobUtil { logger.trace("download state: " + downloadState); - if(downloadState==null) //Case with exception + if(downloadState==null){ //Case with exception + logger.warn("download state is null, returning"); return null; + } boolean onSaving = true; - //GET CHILDREN ArrayList listChildJob = new ArrayList(); - - if(statusResponse.getSubNodes()!=null){ + logger.trace("status response subnodes is != null? " + (statusResponse.getSubNodes()!=null)); + if(statusResponse.getSubNodes()!=null){ + logger.trace("subNodes size is: " + statusResponse.getSubNodes().size()); + for (NodeStatus nodeStatus : statusResponse.getSubNodes()){ + logger.trace("node status " + nodeStatus); + DownloadState downloadStateChildren = getDownloadState(nodeStatus.getStatus()); if(!downloadStateChildren.equals(DownloadState.COMPLETED)) onSaving=false; listChildJob.add(new JobTaxonomyModel(UUID.randomUUID().toString(), nodeStatus.getScientificName(),downloadStateChildren)); } - }else + }else{ + logger.trace("status response subnodes is null"); onSaving=false; - + } boolean changeStatus = false; //If status of children is completed and job status is not completed (the file is generated) or failed, set download state on saving