From a88867a8c3f48ecec1615629f59d1be437d6c834 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 24 Jan 2017 09:47:03 +0000
Subject: [PATCH] SSDM-4187: dataset-uploader-api.py: uses getSampleForUpdate
instead of search.
SVN: 37617
---
.../dataset-uploader-api.py | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
index 812fe934a9a..403f5574440 100644
--- a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
@@ -31,22 +31,6 @@ import subprocess
import os.path
import re
-def getSampleByIdentifierForUpdate(tr, identifier):
- space = identifier.split("/")[1];
- code = identifier.split("/")[2];
-
- criteria = SearchCriteria();
- criteria.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.SPACE, space));
- criteria.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.CODE, code));
- criteria.setOperator(SearchOperator.MATCH_ALL_CLAUSES);
-
- searchService = tr.getSearchService();
- found = list(searchService.searchForSamples(criteria));
- if len(found) == 1:
- return tr.makeSampleMutable(found[0]);
- else:
- raise UserFailureException(identifier + " Not found by search service.");
-
def username(sessiontoken):
m = re.compile('(.*)-[^-]*').match(sessiontoken)
if m:
@@ -108,7 +92,7 @@ def insertDataSet(tr, parameters, tableBuilder):
#Create Dataset
dataSet = tr.createNewDataSet(dataSetType);
if sampleIdentifier is not None:
- dataSetSample = getSampleByIdentifierForUpdate(tr, sampleIdentifier);
+ dataSetSample = tr.getSampleForUpdate(sampleIdentifier);
dataSet.setSample(dataSetSample);
elif experimentIdentifier is not None:
dataSetExperiment = tr.getExperimentForUpdate(experimentIdentifier);
--
GitLab