Changeset 624 for trunk/zoo-project

Timestamp:

Apr 10, 2015, 8:02:04 PM (10 years ago)

Author:

djay

Message:

Fix for python support.

Location:

trunk/zoo-project

Files:

• zoo-kernel/service_internal.c (modified) (1 diff)
• zoo-kernel/service_internal_python.c (modified) (3 diffs)
• zoo-services/utils/status/cgi-env/service.py (modified) (1 diff)

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

@@ -190 +190 @@
 semid getShmLockId(maps* conf, int nsems){
     semid sem_id;
-        char key[MAX_PATH];
-        getKeyValue(conf, key, MAX_PATH);
+    char key[MAX_PATH];
+    getKeyValue(conf, key, MAX_PATH);
     
     sem_id = CreateSemaphore( NULL, nsems, nsems+1, key);

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

@@ -551 +551 @@
     free(cursor->content);
     free(cursor);
-    Py_DECREF(key);
 #ifdef DEBUG
     dumpMaps(res);
@@ -643 +642 @@
   PyObject* confdict;
   int istatus;
-  char* status;
+  char* status=NULL;
   if (!PyArg_ParseTuple(args, "O!i", &PyDict_Type, &confdict, &istatus)){
 #ifdef DEBUG
     fprintf(stderr,"Incorrect arguments to update status function");
 #endif
-    return NULL;
+    Py_RETURN_NONE;
   }
   if (istatus < 0 || istatus > 100){
      PyErr_SetString(ZooError, "Status must be a percentage.");
-     return NULL;
+     Py_RETURN_NONE;
   }else{
      char tmpStatus[4];
@@ -658 +657 @@
      status = zStrdup(tmpStatus);
   }
-  /* now update the map */
-  {
-    PyObject* lenv = PyMapping_GetItemString(confdict, (char *)"lenv");
-    if (lenv && PyMapping_Check(lenv)){
-      PyObject* valobj = PyString_FromString(status);
-      PyMapping_SetItemString(lenv, (char *)"status", valobj);
-      Py_DECREF(valobj);
-    }
-    Py_DECREF(lenv);
-  }
+  // create a local copy and update the lenv map
   conf = mapsFromPyDict((PyDictObject*)confdict);
-  if (getMapFromMaps(conf,"lenv","status") != NULL){
-    if(status!=NULL){
-      setMapInMaps(conf,"lenv","status",status);
-      free(status);
-    }
-    else
-      setMapInMaps(conf,"lenv","status","15");
-    _updateStatus(conf);
-  }
+  if(status!=NULL){
+    setMapInMaps(conf,"lenv","status",status);
+    free(status);
+  }
+  else
+    setMapInMaps(conf,"lenv","status","15");
+  _updateStatus(conf);
   freeMaps(&conf);
   free(conf);

trunk/zoo-project/zoo-services/utils/status/cgi-env/service.py

@@ -3 +3 @@
     i=0
     while i < 100:
-        conf["lenv"]["status"]=str(i)
+        conf["lenv"]["message"]="Step "+str(i)
         zoo.update_status(conf,i)
         time.sleep(0.5)