From 6801b554723732d91070efc09c755557b5f13592 Mon Sep 17 00:00:00 2001 From: Federico De Faveri Date: Tue, 30 Apr 2013 16:22:17 +0000 Subject: [PATCH] a re-sync git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@74306 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 +++ pom.xml | 22 ------------------- .../client/SpeciesSearchFormPanel.java | 2 +- .../server/service/QueryBuilder.java | 2 +- .../server/service/ResultItemConverter.java | 2 +- .../server/service/SpeciesService.java | 6 +---- 6 files changed, 7 insertions(+), 30 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index d07fedc..2e89d73 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,6 +4,9 @@ + + uses + diff --git a/pom.xml b/pom.xml index a32c7f0..4a7da93 100644 --- a/pom.xml +++ b/pom.xml @@ -49,14 +49,12 @@ org.gcube.data.spd spd-client-library [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) - provided org.gcube.data.spd spd-model [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided @@ -70,21 +68,18 @@ org.gcube.data.spd spql-parser [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided org.gcube.common csv4j [1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.resources.discovery discovery-client [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided @@ -114,14 +109,12 @@ storage-manager-core [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - provided org.gcube.contentmanagement storage-resource-link-plugin [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided @@ -129,7 +122,6 @@ org.gcube.portlets.user workspace-light-tree [2.9.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided @@ -137,21 +129,18 @@ org.gcube.portlets.user gis-viewer [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) - provided org.gcube.portlets.user gcube-gis-viewer [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided org.gwtopenmaps.openlayers gwt-openlayers-client 0.6 - provided @@ -182,13 +171,11 @@ com.google.gwt gwt-user ${gwtVersion} - provided com.google.gwt gwt-servlet ${gwtVersion} - provided com.sencha.gxt @@ -200,57 +187,48 @@ org.gcube.portlets.user gcube-widgets [1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.portal custom-portal-handler [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.applicationsupportlayer aslcore [3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT) - provided org.gcube.portal social-networking-library [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.portlets.user home-library [4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT) - provided org.gcube.portlets.user home-library-jcr [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided org.gcube.dvos usermanagement-core [1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT) - provided com.liferay.portal portal-service 6.0.6 - provided javax.portlet portlet-api 2.0 - provided org.slf4j diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java index e9fe2cc..06ef87f 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java @@ -237,7 +237,7 @@ public class SpeciesSearchFormPanel extends ContentPanel { @Override public void onClick(ClickEvent event) { - textArea.setValue("'Carcharodon carcharias' as ScientificName in Obis, GBIF return * "); + textArea.setValue("SEARCH BY SN 'Carcharodon carcharias' in OBIS RETURN Product"); } }); diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/QueryBuilder.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/QueryBuilder.java index 9f5bc21..3e629d8 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/QueryBuilder.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/QueryBuilder.java @@ -70,7 +70,7 @@ public class QueryBuilder { query.append("RETURN "); if (searchFilters.getResultType()!=null) { switch (searchFilters.getResultType()) { - case RESULTITEM: query.append("Product HAVING xpath(\"//product[type='OCCURRENCE' and counter>0]\")"); break; + case RESULTITEM: query.append("Product HAVING xpath(\"//product[type='OCCURRENCES' and counter>0]\")"); break; case TAXONOMYITEM: query.append("Taxon"); break; } } else { diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/ResultItemConverter.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/ResultItemConverter.java index f3884aa..8b5c952 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/ResultItemConverter.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/ResultItemConverter.java @@ -144,7 +144,7 @@ public class ResultItemConverter implements Converter { if (input.getProducts()!=null) { for (Product product:input.getProducts()) { switch (product.getType()) { - case Occurences: { + case Occurrence: { row.setOccurencesCount(product.getCount()); row.setOccurencesKey(product.getKey()); } break; diff --git a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/SpeciesService.java b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/SpeciesService.java index d7e93da..5761423 100644 --- a/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/SpeciesService.java +++ b/src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/SpeciesService.java @@ -9,7 +9,6 @@ import static org.gcube.data.streams.dsl.Streams.convert; import java.io.InputStream; import java.util.ArrayList; import java.util.Arrays; -import java.util.Calendar; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -25,7 +24,6 @@ import org.gcube.data.spd.client.proxies.Classification; import org.gcube.data.spd.client.proxies.Executor; import org.gcube.data.spd.client.proxies.Manager; import org.gcube.data.spd.client.proxies.Occurrence; -import org.gcube.data.spd.model.Condition; import org.gcube.data.spd.model.Conditions; import org.gcube.data.spd.model.PluginDescription; import org.gcube.data.spd.model.RepositoryInfo; @@ -34,8 +32,6 @@ import org.gcube.data.spd.model.products.ResultElement; import org.gcube.data.spd.model.products.TaxonomyItem; import org.gcube.data.spd.model.util.Capabilities; import org.gcube.data.spd.stubs.exceptions.InvalidIdentifierException; -import org.gcube.data.spd.stubs.types.CapabilityDescription; -import org.gcube.data.spd.stubs.types.PluginProperty; import org.gcube.data.spd.stubs.types.Status; import org.gcube.data.streams.Stream; import org.gcube.portlets.user.speciesdiscovery.server.stream.CloseableIterator; @@ -278,7 +274,7 @@ public class SpeciesService { switch (capability) { case Classification: return SpeciesCapability.TAXONOMYITEM; case NamesMapping: return SpeciesCapability.NAMESMAPPING; - case Occurences: return SpeciesCapability.RESULTITEM; + case Occurrence: return SpeciesCapability.RESULTITEM; case Synonims: return SpeciesCapability.SYNONYMS; default: return SpeciesCapability.UNKNOWN; }