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

Timestamp:

Feb 12, 2014, 3:25:15 PM (10 years ago)

Author:

djay

Message:

Add the optional Ruby Language Support to the ZOO-Kernel with an API similar to the Python ZOO-API. Small rewrite of Python support. Fix issue #86 and #87. Add usid in [lenv] section, this value is used to generate an unique identifier based on time and the process identifier. This usid is now used to name the stored result or the mapfile generated. Remove *some* warning messages displayed at compilation time.

File:

• trunk/zoo-project/zoo-kernel/service.h (modified) (9 diffs)

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

@@ -35 +35 @@
 #ifndef snprintf
 #define snprintf sprintf_s
+#endif
+#define zStrdup _strdup
+#define zMkdir _mkdir
+#define zOpen _open
+#define zWrite _write
 #else
-
-#endif
+#define zStrdup strdup
+#define zMkdir mkdir
 #endif 
 
@@ -53 +58 @@
 #include <stdio.h>
 #include <string.h>
-
 #ifndef WIN32
 #define bool int
@@ -176 +180 @@
   static map* createMap(const char* name,const char* value){
     map* tmp=(map *)malloc(MAP_SIZE);
-    tmp->name=strdup(name);
-    tmp->value=strdup(value);
+    tmp->name=zStrdup(name);
+    tmp->value=zStrdup(value);
     tmp->next=NULL;
     return tmp;
@@ -253 +257 @@
     int i=0;
     while(curs!=NULL){
-      if(i==0)
-        if(type==0)
-          sprintf(dataInputsKVP,"%s=",curs->name);
-        else
-          sprintf(dataInputsKVP,"%s",curs->name);
-      else{
-        char *temp=strdup(dataInputsKVP);
-        if(type==0)
-          sprintf(dataInputsKVP,"%s;%s=",temp,curs->name);
-        else
-          sprintf(dataInputsKVP,"%s;%s",temp,curs->name);
-        free(temp);
-      }
-      map* icurs=curs->content;
-      if(type==0){
-        char *temp=strdup(dataInputsKVP);
-        if(getMap(m->content,"xlink:href")!=NULL)
-          sprintf(dataInputsKVP,"%sReference",temp);
-        else
-          sprintf(dataInputsKVP,"%s%s",temp,icurs->value);
-        free(temp);
-      }
-      while(icurs!=NULL){
-        if(strcasecmp(icurs->name,"value")!=0 &&
-           strcasecmp(icurs->name,"Reference")!=0 &&
-           strcasecmp(icurs->name,"minOccurs")!=0 &&
-           strcasecmp(icurs->name,"maxOccurs")!=0 &&
-           strcasecmp(icurs->name,"inRequest")!=0){
-          char *itemp=strdup(dataInputsKVP);
-          sprintf(dataInputsKVP,"%s@%s=%s",itemp,icurs->name,icurs->value);
-          free(itemp);
+      map *inRequest=getMap(curs->content,"inRequest");
+      if(strncasecmp(inRequest->value,"true",4)==0){
+        if(i==0)
+          if(type==0)
+            sprintf(dataInputsKVP,"%s=",curs->name);
+          else
+            sprintf(dataInputsKVP,"%s",curs->name);
+        else{
+          char *temp=zStrdup(dataInputsKVP);
+          if(type==0)
+            sprintf(dataInputsKVP,"%s;%s=",temp,curs->name);
+          else
+            sprintf(dataInputsKVP,"%s;%s",temp,curs->name);
+          free(temp);
         }
-        icurs=icurs->next;
+        map* icurs=curs->content;
+        if(type==0){
+          char *temp=zStrdup(dataInputsKVP);
+          if(getMap(m->content,"xlink:href")!=NULL)
+            sprintf(dataInputsKVP,"%sReference",temp);
+          else
+            sprintf(dataInputsKVP,"%s%s",temp,icurs->value);
+          free(temp);
+        }
+        while(icurs!=NULL){
+          if(strcasecmp(icurs->name,"value")!=0 &&
+             strcasecmp(icurs->name,"Reference")!=0 &&
+             strcasecmp(icurs->name,"minOccurs")!=0 &&
+             strcasecmp(icurs->name,"maxOccurs")!=0 &&
+             strcasecmp(icurs->name,"inRequest")!=0){
+            char *itemp=zStrdup(dataInputsKVP);
+            sprintf(dataInputsKVP,"%s@%s=%s",itemp,icurs->name,icurs->value);
+            free(itemp);
+          }
+          icurs=icurs->next;
+        }
       }
       curs=curs->next;
@@ -469 +476 @@
       if(tmp->value!=NULL)
         free(tmp->value);
-      tmp->value=strdup(v);
+      tmp->value=zStrdup(v);
     }
   }
@@ -574 +581 @@
     if(_cursor!=NULL){
       res=(maps*)malloc(MAPS_SIZE);
-      res->name=strdup(_cursor->name);
+      res->name=zStrdup(_cursor->name);
       res->content=NULL;
       res->next=NULL;
@@ -723 +730 @@
         if(_ztmpm->value!=NULL)
           free(_ztmpm->value);
-        _ztmpm->value=strdup(value);
+        _ztmpm->value=zStrdup(value);
       }else{
         addToMap(_tmpm->content,subkey,value);
@@ -729 +736 @@
     }else{
       maps *tmp=(maps*)malloc(MAPS_SIZE);
-      tmp->name=strdup(key);
+      tmp->name=zStrdup(key);
       tmp->content=createMap(subkey,value);
       tmp->next=NULL;
@@ -779 +786 @@
 #endif
       tmp=(elements*)malloc(ELEMENTS_SIZE);
-      tmp->name=strdup(e->name);
+      tmp->name=zStrdup(e->name);
       tmp->content=NULL;
       addMapToMap(&tmp->content,e->content);
       tmp->metadata=NULL;
       addMapToMap(&tmp->metadata,e->metadata);
-      tmp->format=strdup(e->format);
+      tmp->format=zStrdup(e->format);
       if(e->defaults!=NULL){
         tmp->defaults=(iotype*)malloc(IOTYPE_SIZE);