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

Timestamp:

Sep 23, 2014, 4:03:07 PM (10 years ago)

Author:

djay

Message:

Fixes for metapath definition with prefixed names.

File:

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

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

@@ -193 +193 @@
   PyObject *pName, *pModule, *pFunc;
   tmp=getMap(s->content,"serviceProvider");
-  if(tmp!=NULL)
-    pName = PyString_FromString(tmp->value);
+  map* mp=getMap(request,"metapath");
+  if(tmp!=NULL){
+    if(mp!=NULL && strlen(mp->value)>0){
+      char *mps=zStrdup(mp->value);
+      int i,len=strlen(mps);
+      int j=0;
+      for(i=0;i<len;i++){
+        if(mps[i]=='/'){
+          mps[i]='.';
+        }
+      }
+      char *mn=(char*)malloc((strlen(mps)+strlen(tmp->value)+2)*sizeof(char));
+      sprintf(mn,"%s.%s",mps,tmp->value);
+      pName = PyString_FromString(mn);
+      free(mn);
+      free(mps);
+    }
+    else{
+      pName = PyString_FromString(tmp->value);
+      fprintf(stderr,"%s %d",tmp->value,__LINE__);
+    }
+  }
   else{
     map* err=createMap("text","Unable to parse serviceProvider please check your zcfg file.");
@@ -457 +477 @@
 #endif
   }
+  Py_DECREF(list);
   return res;
 }
@@ -507 +528 @@
     }
   }
+  Py_DECREF(list);
   return res;
 }