Changeset 465 for trunk/zoo-project/zoo-kernel/service.h

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.h (modified) (10 diffs)

trunk/zoo-project/zoo-kernel/service.h

@@ -82 +82 @@
 #define SHMSZ     27
 
+#include "version.h" 
 
 #ifdef DEBUG_STACK
@@ -133 +134 @@
   static void _dumpMap(map* t){
     if(t!=NULL){
-      fprintf(stderr,"[%s] => [%s] \n",t->name,t->value);
+      fprintf(stderr,"%s: %s\n",t->name,t->value);
       fflush(stderr);
         }else{
@@ -437 +438 @@
     map* tmp=mi;
     map* _cursor=*mo;
-    if(tmp==NULL){
-      if(_cursor!=NULL){
-        while(_cursor!=NULL)
-          _cursor=_cursor->next;
-        _cursor=NULL;
-      }else
-        *mo=NULL;
-    }
     while(tmp!=NULL){
       if(_cursor==NULL){
-        if(*mo==NULL)
-          *mo=createMap(tmp->name,tmp->value);
-        else
-          addToMap(*mo,tmp->name,tmp->value);
+        *mo=createMap(tmp->name,tmp->value);
+        (*mo)->next=NULL;
       }
       else{
@@ -457 +448 @@
         dumpMap(_cursor);
 #endif
-        while(_cursor!=NULL)
+        while(_cursor->next!=NULL)
           _cursor=_cursor->next;
-        _cursor=createMap(tmp->name,tmp->value);
-        _cursor->next=NULL;
-      }
+        map* tmp1=getMap(_cursor,tmp->name);
+        if(tmp1==NULL)
+          _cursor->next=createMap(tmp->name,tmp->value);
+        else{
+          free(tmp1->value);
+          tmp1->value=zStrdup(tmp->value);
+        }
+      }
+      _cursor=*mo;
       tmp=tmp->next;
 #ifdef DEBUG
@@ -568 +565 @@
       if(_cursor==NULL){
         *mo=dupMaps(&mi);
-        (*mo)->next=NULL;
       }
       else{
+        maps* tmp1=getMaps(*mo,tmp->name);
         while(_cursor->next!=NULL)
           _cursor=_cursor->next;
-        _cursor->next=dupMaps(&tmp);
+        if(tmp1==NULL)
+          _cursor->next=dupMaps(&tmp);
+        else
+          addMapToMap(&tmp1->content,tmp->content);
+        _cursor=*mo;
       }
       tmp=tmp->next;
@@ -603 +604 @@
     else
       sprintf(tmp,"%s",key);
-    map* tmpSize=getMapArray(m,"size",index);
+    map* tmpSize=getMapArray(m,(char*)"size",index);
     if(tmpSize!=NULL && strncasecmp(key,"value",5)==0){
 #ifdef DEBUG
       fprintf(stderr,"%s\n",tmpSize->value);
 #endif
-      map* ptr=getMapOrFill(m,tmp,"");
+      map* ptr=getMapOrFill(m,tmp,(char *)"");
       free(ptr->value);
       ptr->value=(char*)malloc((atoi(tmpSize->value)+1)*sizeof(char));
@@ -618 +619 @@
 
   static map* getMapType(map* mt){
-    map* tmap=getMap(mt,"mimeType");
+    map* tmap=getMap(mt,(char *)"mimeType");
     if(tmap==NULL){
       tmap=getMap(mt,"dataType");
@@ -646 +647 @@
 
     char *tmpV[8]={
-      "size",
-      "value",
-      "uom",
-      "Reference",
-      "xlink:href",
+      (char*)"size",
+      (char*)"value",
+      (char*)"uom",
+      (char*)"Reference",
+      (char*)"xlink:href",
       typ,
-      "schema",
-      "encoding"
+      (char*)"schema",
+      (char*)"encoding"
     };
     sprintf(tmpLen,"%d",len+1);
@@ -730 +731 @@
   }
 
+  static void dumpElementsAsYAML(elements* e){
+    elements* tmp=e;
+    while(tmp!=NULL){
+      for(int i=0;i<2;i++)
+        fprintf(stderr," ");
+      fprintf(stderr,"%s:\n",tmp->name);
+      map* mcurs=tmp->content;
+      while(mcurs!=NULL){
+        for(int i=0;i<4;i++)
+          fprintf(stderr," ");
+        _dumpMap(mcurs);
+        mcurs=mcurs->next;
+      }
+      mcurs=tmp->metadata;
+      if(mcurs!=NULL){
+        for(int i=0;i<4;i++)
+          fprintf(stderr," ");
+        fprintf(stderr,"MetaData:\n");
+        while(mcurs!=NULL){
+          for(int i=0;i<6;i++)
+            fprintf(stderr," ");
+          _dumpMap(mcurs);
+          mcurs=mcurs->next;
+        }
+      }
+      for(int i=0;i<4;i++)
+        fprintf(stderr," ");
+      fprintf(stderr,"%s:\n",tmp->format);
+      iotype* tmpio=tmp->defaults;
+      int ioc=0;
+      while(tmpio!=NULL){
+        for(int i=0;i<6;i++)
+          fprintf(stderr," ");
+        fprintf(stderr,"default:\n");
+        mcurs=tmpio->content;
+        while(mcurs!=NULL){
+          for(int i=0;i<8;i++)
+            fprintf(stderr," ");
+          if(strcasecmp(mcurs->name,"range")==0){
+            fprintf(stderr,"range: \"%s\"\n",mcurs->value);
+          }else
+            _dumpMap(mcurs);
+          mcurs=mcurs->next;
+        }
+        tmpio=tmpio->next;
+        ioc++;
+      }
+      tmpio=tmp->supported;
+      ioc=0;
+      while(tmpio!=NULL){
+        for(int i=0;i<6;i++)
+          fprintf(stderr," ");
+        fprintf(stderr,"supported:\n");
+        mcurs=tmpio->content;
+        while(mcurs!=NULL){
+          for(int i=0;i<8;i++)
+            fprintf(stderr," ");
+          if(strcasecmp(mcurs->name,"range")==0){
+            fprintf(stderr,"range: \"%s\"\n",mcurs->value);
+          }else
+            _dumpMap(mcurs);
+          mcurs=mcurs->next;
+        }
+        tmpio=tmpio->next;
+        ioc++;
+      }
+      tmp=tmp->next;
+    }
+  }
+
+
   static elements* dupElements(elements* e){
     elements* cursor=e;
@@ -805 +877 @@
     }
     fprintf(stderr,"++++++++++++++++++\n");
+  }
+
+  static void dumpServiceAsYAML(service* s){
+    int level=0;
+    fprintf(stderr,"# %s\n\n",s->name);
+    if(s->content!=NULL){
+      map* mcurs=s->content;
+      dumpMap(mcurs);
+      mcurs=s->metadata;
+      if(mcurs!=NULL){
+        fprintf(stderr,"MetaData:\n");
+        while(mcurs!=NULL){
+          for(int i=0;i<2;i++)
+            fprintf(stderr," ");
+          _dumpMap(mcurs);
+          mcurs=mcurs->next;
+        }
+      }
+    }
+    if(s->inputs!=NULL){
+      fprintf(stderr,"\ninputs:\n",s->name);
+      dumpElementsAsYAML(s->inputs);
+    }
+    if(s->outputs!=NULL){
+      fprintf(stderr,"\noutputs:\n",s->name);
+      dumpElementsAsYAML(s->outputs);
+    }
   }