Changeset 469 for trunk/zoo-project/zoo-kernel/service_conf.y

Timestamp:

May 1, 2014, 1:28:14 AM (10 years ago)

Author:

djay

Message:

Support metapath embedded in service name. Add support for accessing ZOO-Kernel path subdirectories for full list of available services. Fix issue #98.

File:

• trunk/zoo-project/zoo-kernel/service_conf.y (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_conf.y

@@ -204 +204 @@
         dumpService(my_service);
 #endif  
-        if(my_service->inputs==NULL){
+        if(my_service->inputs==NULL && current_element!=NULL && current_element->name!=NULL){
           my_service->inputs=dupElements(current_element);
           my_service->inputs->next=NULL;
+          freeElements(&current_element);
         }
         else if(current_element!=NULL && current_element->name!=NULL){
           addToElements(&my_service->inputs,current_element);
+          freeElements(&current_element);
         }
 #ifdef DEBUG_SERVICE_CONF
@@ -218 +220 @@
         fprintf(stderr,"(DATAOUTPUTS) FREE current_element\n");
 #endif
-        freeElements(&current_element);
         free(current_element);
         current_element=NULL;
@@ -848 +849 @@
   dumpService(my_service);
 #endif
-  if(wait_outputs<0 || my_service==NULL || my_service->name==NULL || my_service->content==NULL || my_service->inputs==NULL || my_service->outputs==NULL){
+  if(wait_outputs<0 || my_service==NULL || my_service->name==NULL || my_service->content==NULL || my_service->outputs==NULL){
     setMapInMaps(conf,"lenv","message",srlval.chaine);
 #ifndef WIN32