From 574592bdac145c2b64c80957b064d9fefcddc5bb Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 29 Oct 2012 14:27:43 +0000
Subject: [PATCH] BIS-226 SP-327 add missing description property on vocabulary
terms to eod sequel listers
SVN: 27403
---
.../Screening openBIS GWT prepare.launch | 20 +++++++++++++++++++
.../bo/common/EntityPropertiesEnricher.java | 1 +
.../bo/common/VocabularyTermRecord.java | 2 ++
.../datasetlister/IDatasetListingQuery.java | 2 +-
.../materiallister/IMaterialListingQuery.java | 2 +-
.../bo/samplelister/ISampleListingQuery.java | 2 +-
6 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 openbis/resource/eclipse/Screening openBIS GWT prepare.launch
diff --git a/openbis/resource/eclipse/Screening openBIS GWT prepare.launch b/openbis/resource/eclipse/Screening openBIS GWT prepare.launch
new file mode 100644
index 00000000000..25330608f7c
--- /dev/null
+++ b/openbis/resource/eclipse/Screening openBIS GWT prepare.launch
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/screening/build/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="screening"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="prepare-gwt,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/screening/build/build.xml}"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java
index 0859635bdd4..9c5fada9dda 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/EntityPropertiesEnricher.java
@@ -148,6 +148,7 @@ public final class EntityPropertiesEnricher implements IEntityPropertiesEnricher
vocabularyTerm = new VocabularyTerm();
vocabularyTerm.setCode(val.code);
vocabularyTerm.setLabel(val.label);
+ vocabularyTerm.setDescription(val.description);
final String template = vocabularyURLMap.get(val.covo_id);
if (template != null)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
index e29d488aff2..d71b9fea1f5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/VocabularyTermRecord.java
@@ -13,5 +13,7 @@ public class VocabularyTermRecord extends BaseEntityPropertyRecord
public String label;
+ public String description;
+
public long term_ordinal;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
index c8f9a64d32b..09de0bf1380 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/datasetlister/IDatasetListingQuery.java
@@ -276,7 +276,7 @@ public interface IDatasetListingQuery extends TransactionQuery, IPropertyListing
*
* @param entityIds The set of sample ids to get the property values for.
*/
- @Select(sql = "SELECT pr.ds_id as entity_id, etpt.prty_id, etpt.script_id, cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal, cvte.is_official"
+ @Select(sql = "SELECT pr.ds_id as entity_id, etpt.prty_id, etpt.script_id, cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal, cvte.is_official, cvte.description"
+ " FROM data_set_properties pr"
+ " JOIN data_set_type_property_types etpt ON pr.dstpt_id=etpt.id"
+ " JOIN controlled_vocabulary_terms cvte ON pr.cvte_id=cvte.id"
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java
index f19fc7affe4..5121be9e8c7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/materiallister/IMaterialListingQuery.java
@@ -95,7 +95,7 @@ public interface IMaterialListingQuery extends TransactionQuery, IPropertyListin
*
* @param entityIds The set of material ids to get the property values for.
*/
- @Select(sql = "SELECT pr.mate_id as entity_id, etpt.prty_id, etpt.script_id, cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal, cvte.is_official"
+ @Select(sql = "SELECT pr.mate_id as entity_id, etpt.prty_id, etpt.script_id, cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal, cvte.is_official, cvte.description"
+ " FROM material_properties pr"
+ " JOIN material_type_property_types etpt ON pr.mtpt_id=etpt.id"
+ " JOIN controlled_vocabulary_terms cvte ON pr.cvte_id=cvte.id"
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
index 0f56e2d9fd2..ea12ff8059a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/samplelister/ISampleListingQuery.java
@@ -404,7 +404,7 @@ public interface ISampleListingQuery extends TransactionQuery, IPropertyListingQ
* @param sampleIds The set of sample ids to get the property values for.
*/
@Select(sql = "SELECT sp.samp_id as entity_id, stpt.prty_id, stpt.script_id, stpt.ordinal, "
- + " cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal as term_ordinal, cvte.is_official"
+ + " cvte.id, cvte.covo_id, cvte.code, cvte.label, cvte.ordinal as term_ordinal, cvte.is_official, cvte.description"
+ " FROM sample_properties sp"
+ " JOIN sample_type_property_types stpt ON sp.stpt_id=stpt.id"
+ " JOIN controlled_vocabulary_terms cvte ON sp.cvte_id=cvte.id"
--
GitLab