gCubeSystem
/
species-discovery
Archived
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a re-sync 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/speciesdiscovery@74306 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Federico De Faveri 2013-04-30 16:22:17 +00:00
parent e8cea125d7
commit 6801b55472
6 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.settings/org.eclipse.wst.common.component
View File

@ -4,6 +4,9 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<dependent-module archiveName="spql-parser-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/spql-parser/spql-parser">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
<property name="context-root" value="species-discovery"/>
</wb-module>

22
pom.xml
View File

@ -49,14 +49,12 @@
<groupId>org.gcube.data.spd</groupId>
<artifactId>spd-client-library</artifactId>
<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.data.spd</groupId>
<artifactId>spd-model</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<!-- <dependency> -->
@ -70,21 +68,18 @@
<groupId>org.gcube.data.spd</groupId>
<artifactId>spql-parser</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>csv4j</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.resources.discovery</groupId>
<artifactId>discovery-client</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<!-- Eclipselink dependencies -->
@ -114,14 +109,12 @@
<artifactId>storage-manager-core</artifactId>
<!-- <version>[1.0.1-SNAPSHOT, 1.11.0-SNAPSHOT)</version> -->
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-resource-link-plugin</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<!-- WSLT dependencies -->
@ -129,7 +122,6 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-light-tree</artifactId>
<version>[2.9.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<!-- GisViewer dependecies -->
@ -137,21 +129,18 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>gis-viewer</artifactId>
<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>gcube-gis-viewer</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gwtopenmaps.openlayers</groupId>
<artifactId>gwt-openlayers-client</artifactId>
<version>0.6</version>
<scope>provided</scope>
</dependency>
<!-- GWT-LOG -->
@ -182,13 +171,11 @@
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>${gwtVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${gwtVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sencha.gxt</groupId>
@ -200,57 +187,48 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>gcube-widgets</artifactId>
<version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>custom-portal-handler</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslcore</artifactId>
<version>[3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>social-networking-library</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>home-library</artifactId>
<version>[4.3.0-SNAPSHOT, 5.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>home-library-jcr</artifactId>
<version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId>
<version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>portal-service</artifactId>
<version>6.0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

2
src/main/java/org/gcube/portlets/user/speciesdiscovery/client/SpeciesSearchFormPanel.java
View File

@ -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");
}
});

2
src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/QueryBuilder.java
View File

@ -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 {

2
src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/ResultItemConverter.java
View File

@ -144,7 +144,7 @@ public class ResultItemConverter implements Converter<ResultItem, ResultRow> {
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;

6
src/main/java/org/gcube/portlets/user/speciesdiscovery/server/service/SpeciesService.java
View File

@ -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;
}