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

Timestamp:

Apr 23, 2014, 3:05:01 AM (10 years ago)

Author:

djay

Message:

Add the optional YAML ZCFG support #4 and the zcfg2yaml converter. Return error messages that enable the service provider to quickly identify the root cause of errors due to configuration file syntax #90. Fix logic in addMapToMap #91. Enable multiple range definition using default and supported blocks. Add the lastest revision number in version.h (available from Python ZOO-API as zoo.VERSION).

File:

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

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

@@ -24 +24 @@
 static bool wait_outputs=false;
 static bool wait_data=false;
-static int services_c=0;
 static service* my_service=NULL;
-static map* previous_content=NULL;
 static map* current_content=NULL;
 static elements* current_element=NULL;
-static map* scontent=NULL;
 static char* curr_key;
 static int debug=0;
@@ -772 +769 @@
  * definition file.
  */
-int getServiceFromFile(const char* file,service** service){
-
-  freeMap(&previous_content);
-  previous_content=NULL;
-  freeMap(&current_content);
-  current_content=NULL;
-  freeMap(&scontent);
+int getServiceFromFile(maps* conf,const char* file,service** service){
+  if(current_content!=NULL){
+    freeMap(&current_content);
+    free(current_content);
+    current_content=NULL;
+  }
 #ifdef DEBUG_SERVICE_CONF
   fprintf(stderr,"(STARTING)FREE current_element\n");
 #endif
-  freeElements(&current_element);
-  free(current_element);
-  current_element=NULL;
+  if(current_element!=NULL){
+    freeElements(&current_element);
+    free(current_element);
+    current_element=NULL;
+  }
   my_service=NULL;
-  scontent=NULL;
 
   wait_maincontent=true;
@@ -810 +807 @@
   int resultatYYParse = srparse() ;
   
+#ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"RESULT: %d %d\n",resultatYYParse,wait_outputs);
+#endif
   if(wait_outputs && current_element!=NULL && current_element->name!=NULL){
     if(my_service->outputs==NULL){      
@@ -848 +848 @@
   dumpService(my_service);
 #endif
-  *service=my_service;
+  if(wait_outputs<0 || my_service==NULL || my_service->name==NULL || my_service->content==NULL || my_service->inputs==NULL || my_service->outputs==NULL){
+    setMapInMaps(conf,"lenv","message",srlval.chaine);
+#ifndef WIN32
+    srlex_destroy();
+#endif
+    return -1;
+  }
+  else
+    *service=my_service;
 
 #ifndef WIN32