[LMS-2117] improved search description and logs

SVN: 21163

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

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()
     {

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() + "]");
         }

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)",