From 14a868950e8f4f95a08fc24bf7d5347b6ac272bc Mon Sep 17 00:00:00 2001
From: Swen Vermeul <swen@ethz.ch>
Date: Tue, 9 Aug 2016 17:50:38 +0200
Subject: [PATCH] fixed search for project
---
src/python/PyBis/pybis/pybis.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/python/PyBis/pybis/pybis.py b/src/python/PyBis/pybis/pybis.py
index fe8166f13cd..a1fce5b78ee 100644
--- a/src/python/PyBis/pybis/pybis.py
+++ b/src/python/PyBis/pybis/pybis.py
@@ -318,7 +318,11 @@ class Openbis:
if space:
sub_criteria.append(self._criteria_for_code(space, 'space'))
if project:
- sub_criteria.append(self._criteria_for_code(project, 'project'))
+ exp_crit = self._criteria_for_code(experiment, 'experiment')
+ proj_crit = self._criteria_for_code(project, 'project')
+ exp_crit['criteria'] = []
+ exp_crit['criteria'].append(proj_crit)
+ sub_criteria.append(exp_crit)
if experiment:
sub_criteria.append(self._criteria_for_code(experiment, 'experiment'))
@@ -327,6 +331,7 @@ class Openbis:
"@type": "as.dto.sample.search.SampleSearchCriteria",
"operator": "AND"
}
+
options = {
"properties": {
"@type": "as.dto.property.fetchoptions.PropertyFetchOptions"
@@ -345,6 +350,7 @@ class Openbis:
},
"@type": "as.dto.sample.fetchoptions.SampleFetchOptions"
}
+
request = {
"method": "searchSamples",
"params": [ self.token,
--
GitLab