";
-
+
// if(isNewTab)
table+=
"" +
@@ -385,8 +376,8 @@ public class TaxonomyRowTable extends HttpServlet {
// " "+TaxonomyGridField.STATUS_REMARKS.getName()+" | " +
// " "+statusRemark+" | " +
// "
" +
-
-
+
+
table +="" +
" "+TaxonomyGridField.DATASOURCE.getName()+" | " +
" "+dataProviderName+" | " +
@@ -415,19 +406,19 @@ public class TaxonomyRowTable extends HttpServlet {
" "+TaxonomyGridField.CREDITS.getName()+" | " +
" "+credits+" | " +
"
" +
-
+
"" +
" "+TaxonomyGridField.PROPERTIES.getName()+" | " +
" "+propertiesHtml+" | " +
"
" +
"
";
-
+
//DEBUG
// System.out.println("Table: "+table);
-
+
return table;
-
+
}
}
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
index 99b524c..bbfed76 100644
--- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/TaxonomySearchServiceImpl.java
@@ -31,7 +31,7 @@ import org.gcube.common.homelibrary.util.WorkspaceUtil;
import org.gcube.data.spd.model.products.OccurrencePoint;
import org.gcube.data.spd.model.products.ResultElement;
import org.gcube.data.spd.model.products.TaxonomyItem;
-import org.gcube.data.spd.stubs.types.Status;
+import org.gcube.data.spd.model.service.types.CompleteJobStatus;
import org.gcube.portlets.user.speciesdiscovery.client.ConstantsSpeciesDiscovery;
import org.gcube.portlets.user.speciesdiscovery.client.model.ClassificationModel;
import org.gcube.portlets.user.speciesdiscovery.client.rpc.TaxonomySearchService;
@@ -59,7 +59,6 @@ import org.gcube.portlets.user.speciesdiscovery.server.stream.CloseableIterator;
import org.gcube.portlets.user.speciesdiscovery.server.stream.IteratorPointInfo;
import org.gcube.portlets.user.speciesdiscovery.server.stream.OccurenceCSVConverter;
import org.gcube.portlets.user.speciesdiscovery.server.stream.OccurenceCSVConverterOpenModeller;
-import org.gcube.portlets.user.speciesdiscovery.server.stream.StreamExtend;
import org.gcube.portlets.user.speciesdiscovery.server.stream.aggregation.FieldAggregator;
import org.gcube.portlets.user.speciesdiscovery.server.stream.aggregation.TaxonomyClassificationAggregator;
import org.gcube.portlets.user.speciesdiscovery.server.util.DateUtil;
@@ -106,14 +105,14 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
/**
* The server side implementation of the RPC service.
- * @author "Federico De Faveri defaveri@isti.cnr.it" -
+ * @author "Federico De Faveri defaveri@isti.cnr.it" -
* @author "Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it"
*/
public class TaxonomySearchServiceImpl extends RemoteServiceServlet implements TaxonomySearchService {
protected static final String SAVE_CHILDREN_OF = "Save children of ";
protected static final String RESUBMIT = "Resubmit";
-
+
private static final long serialVersionUID = -287193068445844326L;
protected static final long MAX_BUFFERING_ELEMENTS = 1000;
@@ -182,7 +181,7 @@ public class TaxonomySearchServiceImpl extends RemoteServiceServlet implements T
@Override
public void searchByScientificName(String searchTerm, SearchFilters searchFilters) throws SearchServiceException {
logger.info("searchByScientificName searchTerm: "+searchTerm+" searchFilters: "+searchFilters);
-
+
stopSearch();
search(searchTerm, SearchType.BY_SCIENTIFIC_NAME, searchFilters);
}
@@ -200,7 +199,7 @@ public class TaxonomySearchServiceImpl extends RemoteServiceServlet implements T
protected SearchResultType search(String searchTerm, SearchType searchType, SearchFilters searchFilters) throws SearchServiceException
{
-
+
ASLSession aslSession = getASLSession();
try {
deleteAllRowIntoDaoTable(); //RESET TABLE
@@ -229,7 +228,7 @@ public class TaxonomySearchServiceImpl extends RemoteServiceServlet implements T
stopSearch();
ASLSession aslSession = getASLSession();
-
+
try {
deleteAllRowIntoDaoTable(); //RESET TABLE
SpeciesService taxonomyService = getSpeciesService();
@@ -237,7 +236,7 @@ public class TaxonomySearchServiceImpl extends RemoteServiceServlet implements T
SessionUtil.setCurrentQuery(aslSession, query);
logger.info("service return iterator searched...");
-
+
SearchByQueryParameter queryParameters = QueryUtil.getQueryResultType(query);
CloseableIterator