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

Timestamp:

Dec 23, 2012, 11:50:33 AM (11 years ago)

Author:

djay

Message:

Fix handling of multiple outputs. Small fix to build with bleeding edge gcc. Add missing copyright in service_internal_ms.c/h. Better gesture of session data. Update HISTORY.txt content.

File:

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

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

@@ -151 +151 @@
 : INFCAR ID Attributeetoile SUPCAR
 {
+#ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"(%s %d) %s\n",__FILE__,__LINE__,$2);
+  fflush(stderr);
+#endif
   if(my_service->content==NULL){
 #ifdef DEBUG_SERVICE_CONF
@@ -226 +230 @@
 #ifdef DEBUG_SERVICE_CONF
         fprintf(stderr,"(DATAOUTPUTS - %d) ALLOCATE current_element (%s)\n",__LINE__,$2);
+        fflush(stderr);
 #endif
         current_element=(elements*)malloc(ELEMENTS_SIZE);
@@ -272 +277 @@
           if(wait_metadata==true){
             if(current_content!=NULL){
+#ifdef DEBUG_SERVICE_CONF
+              fprintf(stderr,"add current_content to current_element->content\n");
+              fprintf(stderr,"LINE %d",__LINE__);
+#endif
               addMapToMap(&current_element->metadata,current_content);
               current_element->next=NULL;
@@ -290 +299 @@
             current_element->next=NULL;
             if($2!=NULL)
-            current_element->format=strdup($2);
+              current_element->format=strdup($2);
             current_element->defaults=NULL;
             current_element->supported=NULL;
@@ -312 +321 @@
 #ifdef DEBUG_SERVICE_CONF
   printf("* Identifiant : %s\n",$2);
+  fflush(stdout);
 #endif
 }
@@ -357 +367 @@
 EmptyElemTag
  : INFCAR ID Attributeetoile SLASH SUPCAR       {
+#ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"(%s %d)\n",__FILE__,__LINE__);
+#endif
    if(strncasecmp($2,"Default",7)==0){
      wait_defaults=false;
@@ -386 +399 @@
  : INFCAR SLASH ID SUPCAR
 {
+#ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"(%s %d)\n",__FILE__,__LINE__);
+#endif
   if(strcmp($3,"DataInputs")==0){
     current_data=1;
@@ -495 +511 @@
 | EPAIR {
 #ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"(%s %d)\n",__FILE__,__LINE__);
   fprintf(stderr,"EPAIR FOUND !! \n"); 
   fprintf(stderr,"[%s=>%s]\n",curr_key,$1);
@@ -510 +527 @@
       fprintf(stderr,"[ZOO: service_conf.y line %d free(%s)]\n",__LINE__,curr_key);
 #endif
-      //current_content->next=NULL;
     }
     else{ 
@@ -524 +540 @@
   }
 #ifdef DEBUG_SERVICE_CONF
-  fprintf(stderr,"EPAIR FOUND !! \n"); 
   fprintf(stderr,"[%s=>%s]\n",curr_key,$1);
   fprintf(stderr,"[ZOO: service_conf.y line %d free(%s)]\n",__LINE__,curr_key);
+  dumpMap(current_content);
   fflush(stderr);
 #endif
@@ -540 +556 @@
 processid
 : ANID  {
+#ifdef DEBUG_SERVICE_CONF
+  fprintf(stderr,"(%s %d)\n",__FILE__,__LINE__);
+#endif
   if(data==-1){
     data=1;
@@ -690 +709 @@
             free(current_element);
             current_element=NULL;
+            current_element=(elements*)malloc(ELEMENTS_SIZE);
+            char *cen=strdup($1);
+            current_element->name=(char*)malloc((strlen(cen)-1)*sizeof(char));
+            cen[strlen(cen)-1]=0;
+            cen+=1;
+            sprintf(current_element->name,"%s",cen);
+            cen-=1;
+            free(cen);
+            current_element->content=NULL;
+            current_element->metadata=NULL;
+            current_element->format=NULL;
+            current_element->defaults=NULL;
+            current_element->supported=NULL;
+            current_element->next=NULL;
           }
           else{
 #ifdef DEBUG_SERVICE_CONF
             fprintf(stderr,"NAME OUT %s\n",$1);
-            fprintf(stderr,"(DATAOUTPUTS - 545) SET NAME OF current_element\n");
+            fprintf(stderr,"(DATAOUTPUTS - %d) SET NAME OF current_element %s\n",__LINE__,$1);
 #endif
             if($1!=NULL){ 
               char *cen=strdup($1);
-              current_element->name=(char*)malloc((strlen(cen)-1)*sizeof(char*));
+              current_element->name=(char*)malloc((strlen(cen))*sizeof(char*));
               cen[strlen(cen)-1]=0;
 #ifdef DEBUG