From 9a69e12c7ce63eda4111918d45b3e5a9b6603668 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 6 May 2011 13:21:19 +0000
Subject: [PATCH] [LMS-2117] improved search description and logs
SVN: 21163
---
.../ui/search/DetailedSearchCriteriaWidget.java | 2 --
.../ui/search/DetailedSearchMainCriteriaWidget.java | 6 ++++++
.../generic/shared/basic/dto/DetailedSearchCriteria.java | 2 +-
.../server/api/v1/GeneralInformationServiceTest.java | 8 ++++----
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java
index c494714294d..8dad169ce09 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchCriteriaWidget.java
@@ -162,8 +162,6 @@ abstract public class DetailedSearchCriteriaWidget extends VerticalPanel
public String getCriteriaDescription()
{
StringBuffer sb = new StringBuffer();
- sb.append(getConnection().getLabel());
- sb.append(": ");
boolean first = true;
for (DetailedSearchCriterionWidget cw : criteriaWidgets)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java
index a8b797bd989..5b525b56119 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/search/DetailedSearchMainCriteriaWidget.java
@@ -56,6 +56,12 @@ public class DetailedSearchMainCriteriaWidget extends DetailedSearchCriteriaWidg
super.reset();
}
+ @Override
+ public String getCriteriaDescription()
+ {
+ return matchRadios.getSelectedLabel() + ": " + super.getCriteriaDescription();
+ }
+
@Override
protected SearchCriteriaConnection getConnection()
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
index fede0b12ea4..ec932652107 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DetailedSearchCriteria.java
@@ -112,7 +112,7 @@ public class DetailedSearchCriteria implements ISerializable
{
if (sb.length() > 0)
{
- sb.append(",\n");
+ sb.append(", ");
}
sb.append("[" + subCriteria.toString() + "]");
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
index 28796f1bb36..544ed7949b6 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceTest.java
@@ -220,7 +220,7 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase
assertEquals(1, result.size());
Sample resultSample = result.get(0);
assertEquals("/space/code", resultSample.getIdentifier());
- assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value,\n"
+ assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value, "
// check experiment subcriteria
+ "[EXPERIMENT: ATTRIBUTE CODE: a code AND ATTRIBUTE PROJECT: a project AND "
+ "PROPERTY EXP_PROPERTY: exp property value]" + " (with wildcards)",
@@ -239,7 +239,7 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase
assertEquals(1, result.size());
Sample resultSample = result.get(0);
assertEquals("/space/code", resultSample.getIdentifier());
- assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value,\n"
+ assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value, "
// check parent subcriteria
+ "[SAMPLE_PARENT: ATTRIBUTE CODE: parent code AND "
+ "PROPERTY PARENT_PROPERTY: parent property value]" + " (with wildcards)",
@@ -258,7 +258,7 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase
assertEquals(1, result.size());
Sample resultSample = result.get(0);
assertEquals("/space/code", resultSample.getIdentifier());
- assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value,\n"
+ assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value, "
// check parent subcriteria
+ "[SAMPLE_CHILD: ATTRIBUTE CODE: child code AND "
+ "PROPERTY CHILD_PROPERTY: child property value]" + " (with wildcards)",
@@ -278,7 +278,7 @@ public class GeneralInformationServiceTest extends AbstractServerTestCase
assertEquals(1, result.size());
Sample resultSample = result.get(0);
assertEquals("/space/code", resultSample.getIdentifier());
- assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value,\n"
+ assertEquals("ATTRIBUTE CODE: a code AND PROPERTY MY_PROPERTY2: a property value, "
// check container subcriteria
+ "[SAMPLE_CONTAINER: ATTRIBUTE CODE: container code AND "
+ "PROPERTY CONTAINER_PROPERTY: container property value]" + " (with wildcards)",
--
GitLab