From 30b8ef6fbf3f5e0018a3b73e69d30d7a1bc097ab Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 24 Apr 2017 07:52:19 +0000
Subject: [PATCH] SSDM-4925: Changing lucene name of 'space id' to 'sample
space id'
SVN: 38081
---
.../translator/space/search/SpaceSearchCriteriaTranslator.java | 2 +-
.../ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java | 2 +-
.../generic/shared/dto/hibernate/SearchFieldConstants.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
index 84a51bc2b8f..79269b628b0 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/space/search/SpaceSearchCriteriaTranslator.java
@@ -41,7 +41,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstant
public class SpaceSearchCriteriaTranslator extends AbstractFieldFromCompositeSearchCriteriaTranslator
{
private static final DetailedSearchField SPACE_ID_FIELD = DetailedSearchField.createAttributeField(
- new SimpleAttributeSearchFieldKind(SearchFieldConstants.SPACE_ID, "Space ID"));
+ new SimpleAttributeSearchFieldKind(SearchFieldConstants.SAMPLE_SPACE_ID, "Space ID"));
private static final EnumSet<SearchObjectKind> ENTITY_KINDS_WITH_SPACE = EnumSet.of(SearchObjectKind.EXPERIMENT, SearchObjectKind.SAMPLE);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
index 8101685de9d..a7c0454068c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java
@@ -563,7 +563,7 @@ public class SamplePE extends AttachmentHolderPE implements IIdAndCodeHolder, Co
// used only by Hibernate Search
@SuppressWarnings("unused")
@Transient
- @Field(index = Index.YES, store = Store.YES, name = SearchFieldConstants.SPACE_ID)
+ @Field(index = Index.YES, store = Store.YES, name = SearchFieldConstants.SAMPLE_SPACE_ID)
@FieldBridge(impl = NullBridge.class)
private Long getSpaceId()
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
index 7f567a5f3f8..ff87fd00377 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/hibernate/SearchFieldConstants.java
@@ -80,6 +80,8 @@ public final class SearchFieldConstants
public static final String CONTAINER_ID = PREFIX_CONTAINER + ID;
public static final String SPACE_ID = PREFIX_SPACE + ID;
+
+ public static final String SAMPLE_SPACE_ID = PREFIX_SAMPLE + PREFIX_SPACE + ID;
public static final String DELETED = "deleted";
--
GitLab