SSDM-2495 : Adding v3 client API to ELN (Last stable version before making fundamental changes)

SVN: 34693

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

@@ -574,6 +574,7 @@ function ServerFacade(openbisServer) {
 //				require(["util/Json"], function(Json){
 //					Json.fromJson(jsonParsed).done(function(data) {
 //						var samples = data.objects;
+//						callbackFunction(samples);
 //					}).fail(function() {
 //						alert("V3 dropbox search failed to be parsed.");
 //					});
@@ -905,6 +906,15 @@ function ServerFacade(openbisServer) {
 	//
 	// Free Text Search
 	//
+//	this.searchWithText = function(freeText, callbackFunction)
+//	{
+//		this.searchSamples({
+//			"anyField" : freeText,
+//			"withProperties" : true,
+//			"withOrOperator" : true
+//		}, callbackFunction);
+//	}
+	
 	this.searchWithText = function(freeText, callbackFunction)
 	{
 		var _this = this;
@@ -989,6 +999,7 @@ function ServerFacade(openbisServer) {
 		
 		return sampleCriteria;
 	}
+	
 	//
 	// Search Domains
 	//

plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py

@@ -493,9 +493,12 @@ def searchSamples(tr, parameters, tableBuilder, sessionId):
 	###############
 	############### V3 Search
 	###############
+	fechOptions = parameters;
+	
+	# FreeText
+	anyField = fechOptions.get("anyField");
 	
 	# Attributes
-	fechOptions = parameters;
 	samplePermId = fechOptions.get("samplePermId");
 	sampleIdentifier = fechOptions.get("sampleIdentifier");
 	sampleCode = fechOptions.get("sampleCode");
@@ -517,9 +520,19 @@ def searchSamples(tr, parameters, tableBuilder, sessionId):
 
 	#Search Setup
 	criterion = SampleSearchCriterion();
-	criterion.withAndOperator();
 	fetchOptions = SampleFetchOptions();
 	
+	#Operator
+	withOrOperator = fechOptions.get("withOrOperator");
+	if withOrOperator:
+		criterion.withOrOperator();
+	else:
+		criterion.withAndOperator();
+	
+	#Free Text
+	if anyField is not None:
+		criterion.withAnyField().thatContains(anyField);
+	
 	#Attributes
 	if samplePermId is not None:
 		criterion.withPermId().thatEquals(samplePermId);
@@ -554,6 +567,12 @@ def searchSamples(tr, parameters, tableBuilder, sessionId):
 	if withDescendants:
 		fetchOptions.withChildren(fetchOptions);
 	
+	#Standard Fetch Options, always use
+	fetchOptions.withType();
+	fetchOptions.withSpace();
+	fetchOptions.withRegistrator();
+	fetchOptions.withModifier();
+	
 	###############
 	###############
 	###############