Changeset 967 for trunk/zoo-project/zoo-kernel/service_internal_python.c

Timestamp:

Dec 18, 2020, 2:13:22 PM (3 years ago)

Author:

djay

Message:

Add support for the two inputs / outputs syntaxes discussed in SWG in both the ZOO-Kernel and the HTML basic UI. Update documentation, add a section for the ZOO-API in Python language section. Rename variables in service.c to ease readabiliy.

File:

• trunk/zoo-project/zoo-kernel/service_internal_python.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/service_internal_python.c

@@ -468 +468 @@
   while(tmp!=NULL){
     PyObject* name=PyString_FromString(tmp->name);
-    if(strcasecmp(tmp->name,"value")==0 && strlen(tmp->value)>0) {
+    if(strcasecmp(tmp->name,"value")==0) {
       if(isArray!=NULL){
         map* len=getMap(tmp,"length");
@@ -492 +492 @@
               lvalue=PyString_FromString(vMap->value);
             }
-            else{    
-              lvalue=PyString_FromStringAndSize(vMap->value,atoi(sMap->value));
+            else{
+              if(strlen(vMap->value)>0)
+                lvalue=PyString_FromStringAndSize(vMap->value,atoi(sMap->value));
+              else
+                lvalue=Py_None;
             }
             if(sMap!=NULL){
@@ -553 +556 @@
       }
       else if(size!=NULL && useFile==NULL){
-        PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
+        PyObject* value;
+        if(strlen(tmp->value)>0)
+          value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
+        else
+          value=Py_None;
         if(PyDict_SetItem(res,name,value)<0){
           Py_DECREF(value);
@@ -572 +579 @@
     }
     else{
-      if(PyDict_GetItem(res,name)==NULL && strlen(tmp->value)>0){
+      if(PyDict_GetItem(res,name)==NULL){
         PyObject* value=PyString_FromString(tmp->value);
         if(PyDict_SetItem(res,name,value)<0){