Ignore:
Timestamp:
May 31, 2011, 3:30:49 AM (13 years ago)
Author:
djay
Message:

Merge trunk r111:r216 into branch-1.2

Location:
branches/branch-1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.2

  • branches/branch-1.2/zoo-kernel/service_internal_python.c

    r108 r217  
    8686  }
    8787  pModule = PyImport_Import(pName);
    88   int i;
    8988  int res=SERVICE_FAILED;
    90   int cpid=getpid();
    9189  if (pModule != NULL) {
    9290    pFunc=PyObject_GetAttrString(pModule,s->name);
    9391    if (pFunc && PyCallable_Check(pFunc)){
     92      PyObject *pValue;
    9493      PyDictObject* arg1=PyDict_FromMaps(m);
    9594      PyDictObject* arg2=PyDict_FromMaps(inputs);
    9695      PyDictObject* arg3=PyDict_FromMaps(outputs);
    9796      PyObject *pArgs=PyTuple_New(3);
    98       PyObject *pValue;
     97      if (!pArgs)
     98        return -1;
    9999      PyTuple_SetItem(pArgs, 0, (PyObject *)arg1);
    100100      PyTuple_SetItem(pArgs, 1, (PyObject *)arg2);
     
    130130        PyErr_Fetch(&ptype, &pvalue, &ptraceback);
    131131        PyObject *trace=PyObject_Str(pvalue);
    132         char tb[1024];
    133132        char pbt[10240];
    134133        if(PyString_Check(trace))
     
    145144        else
    146145          fprintf(stderr,"EMPTY TRACE ?");
    147         PyObject *t;
    148146        pName = PyString_FromString("traceback");
    149147        pModule = PyImport_Import(pName);
     
    302300  int nb=PyList_Size(list);
    303301  int i;
    304   int sizeValue=-1;
    305302  for(i=0;i<nb;i++){
    306303    PyObject* key=PyList_GetItem(list,i);
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png