Added serialization type. 0 - str, 1 - repr. Defaults to str

Author: eduard93

c/iscpython.c

@@ -110,7 +110,7 @@ int SimpleStringFull(char *command, double* result) {
 }
 
 // Assumes initialized environment
-int SimpleString(char *command, char *resultVar, CACHE_EXSTRP result) {
+int SimpleString(char *command, char *resultVar, int serialization, CACHE_EXSTRP result) {
 
 	if (isInitialized == false) {
 		Initialize();
@@ -122,9 +122,14 @@ int SimpleString(char *command, char *resultVar, CACHE_EXSTRP result) {
 
 	if (exists == 1) {
 		PyObject *var = PyObject_GetAttrString(mainModule, resultVar);
+		PyObject* varStr;
+
+		if (serialization==0) {
+			varStr = PyObject_Str(var);
+		} else {
+			varStr = PyObject_Repr(var);
+		}
 
-		//PyObject* varStr = PyObject_Repr(var);
-		PyObject* varStr = PyObject_Str(var);
 		char* str = PyUnicode_AsUTF8(varStr);
 
 		//sprintf(result, "%s", str);
@@ -168,5 +173,5 @@ ZFBEGIN
 	ZFENTRY("GetRandom","D",GetRandom)
 	ZFENTRY("GetRandomSimple","D",GetRandomSimple)
 	ZFENTRY("SimpleStringFull","cD",SimpleStringFull)
-	ZFENTRY("SimpleString","ccJ",SimpleString)
+	ZFENTRY("SimpleString","cciJ",SimpleString)
 ZFEND

isc/py/Callout.cls

@@ -84,16 +84,17 @@ ClassMethod SimpleStringFull(code = {"import random;" _ $$$NL _ "x=random.random
 
 /// Eval code vaiable in initialized context and 
 /// return value of variable str evaluation
+/// serialization - currenlty: 0 - string serialization, 1 - repr serialization.
 /// TODO determine wide variable value.
 /// write ##class(isc.py.Callout).SimpleString()
-ClassMethod SimpleString(code As %String = "", variable As %String = "") As %Double
+ClassMethod SimpleString(code As %String = "", variable As %String = "", serialization As %Integer = 0) As %String
 {
 	set converted = $$$NO
 	if $ZISWIDE(code) {
 		set code = $zcvt(code, "O", "UTF8")
 		set converted = $$$YES
 	}
-	set result = $ZF(-6, ..#PyLibId, ..#SimpleString, code, variable)
+	set result = $ZF(-6, ..#PyLibId, ..#SimpleString, code, variable, serialization)
 
 	set:converted result = $zcvt(result, "I", "UTF8")
 	quit result