gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fix 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@163026 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2018-02-07 17:11:52 +00:00
parent ab66f444ec
commit cc71c9cd3c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
<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="ckan-util-library-2.4.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
<dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="grsf-publisher-ws"/>

10
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
View File

@ -135,11 +135,11 @@ public class TimeSeriesBean<T, T1> implements Comparable<TimeSeriesBean<T, T1>>{
public String toString() {
String value = "" + this.value;
String unit = this.unit != null ? "Unit : " + this.unit : "";
String databaseSource = (this.databaseSource != null ? " - DB Source: " + this.databaseSource : "");
String dataOwner = (this.dataOwner != null ? " - Data Owner: " + this.dataOwner : "");
String referenceYear = year >= 0 ? " - Ref. Year: " + year : "";
String reportingYearOrAssessment = (assessment != null ? " - Rep. Year or Assessment Id: " + assessment + "" : "");
String unit = (this.unit != null && !this.unit.toString().isEmpty() ? "Unit: " + this.unit : "");
String databaseSource = (this.databaseSource != null && !this.databaseSource.toString().isEmpty()? " - DB Source: " + this.databaseSource : "");
String dataOwner = (this.dataOwner != null && !this.dataOwner.toString().isEmpty()? " - Data Owner: " + this.dataOwner : "");
String referenceYear = year > 0 ? " - Ref. Year: " + year : "";
String reportingYearOrAssessment = (assessment != null && !this.assessment.toString().isEmpty()? " - Rep. Year or Assessment Id: " + assessment + "" : "");
String partial = value + " [" +
unit +
reportingYearOrAssessment +