Interoperability now uses new interface

Author: eduard93

isc/py/Main.cls

@@ -130,11 +130,12 @@ ClassMethod GetVariable(variable As %String, serialization As %Integer = 0, ByRe
 /// type - variable type
 /// length - length (in symbols) of variable chosen serialization
 /// set sc = ##class(isc.py.Main).GetVariableInfo()
-ClassMethod GetVariableInfo(variable As %String, serialization As %Integer = 0, Output defined As %Boolean, Output type As %String, Output length As %String) As %Status
+ClassMethod GetVariableInfo(variable As %String = "", serialization As %Integer = 0, Output defined As %Boolean, Output type As %String, Output length As %String) As %Status
 {
 	#dim sc As %Status = $$$OK
 	kill defined, type, length
 
+	quit:variable="" $$$ERROR($$$GeneralError, "Variable argument should be set")
 	set defined = ##class(isc.py.Callout).SimpleString("zzzdef='" _ variable _ "' in vars() or '" _ variable _ "' in globals()", "zzzdef")
 	set defined = $case(defined, "True":$$$YES, "False":$$$NO, :"")
 

isc/py/ens/Operation.cls

@@ -27,7 +27,6 @@ Method Execute(request As isc.py.msg.ExecutionRequest, Output response As isc.py
 	#dim sc As %Status = $$$OK
 	set response = ##class(isc.py.msg.ExecutionResponse).%New()
 	set variables = $lfs(request.Variables)
-	quit:'$Listvalid(variables) $$$ERROR($$$AttributeValueMustBeList, "variables")
 
 	set variable = $lg(variables, 1)
 

isc/py/ens/OutboundAdapter.cls

@@ -23,25 +23,20 @@ Method Execute(code = "", variable = "", lineSeparator As %String = {$c(10)}, Ou
 		set codeList=$lb(code)
 	}
 
-	for i=1:1:$ll(codeList)-1 {
+	for i=1:1:$ll(codeList) {
 		set line = $lg(codeList, i)
-		$$$TRACE(line)
-		do ##class(isc.py.Callout).SimpleString(line)
-		set sc = ##class(isc.py.Callout).GetStatus()
+		$$$TRACE(line)	
+		set sc = ##class(isc.py.Main).SimpleString(line)
 		if $$$ISERR(sc) {
 			set sc = $$$ADDSC($$$ERROR($$$GeneralError, "Code: " _ line), sc)
 			/// TODO continue despite error?
 			quit
 		}
 	}
 	quit:$$$ISERR(sc) ""
-	
-	set line = $lg(codeList, $ll(codeList))
-	$$$TRACE(line)
-	set result = ##class(isc.py.Callout).SimpleString(line, variable)
-	set sc = ##class(isc.py.Callout).GetStatus()
-	set:$$$ISERR(sc) sc = $$$ADDSC($$$ERROR($$$GeneralError, "Code: " _ line _ ", Variable: " _ variable), sc)
-	quit result
+	$$$TRACE("Var: " _ variable)
+	set:variable'="" sc = ##class(isc.py.Main).GetVariable(variable, ##class(isc.py.Callout).#SerializationStr, .result, $$$YES)
+	quit $g(result)
 }
 
 }