Changeset 216 for trunk/zoo-kernel/service.h

Timestamp:

May 31, 2011, 3:13:53 AM (13 years ago)

Author:

djay

Message:

Add WIN32 platform support. Fix for values containing @ passed as KVP.

File:

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

trunk/zoo-kernel/service.h

@@ -28 +28 @@
 #pragma once
 
+#ifdef WIN32
+#define strncasecmp strnicmp
+#define strcasecmp stricmp
+#define snprintf sprintf_s
+#endif 
+
 #ifdef __cplusplus
 extern "C" {
@@ -193 +199 @@
   }
 
+  static map* getLastMap(map* m){
+    map* tmp=m;
+    while(tmp!=NULL){
+      if(tmp->next==NULL){
+        return tmp;
+      }
+      tmp=tmp->next;
+    }
+    return NULL;
+  }
+
   static map* getMapFromMaps(maps* m,const char* key,const char* subkey){
     maps* _tmpm=getMaps(m,key);
@@ -201 +218 @@
     else return NULL;
   }
+
+  static char* getMapsAsKVP(maps* m,int length,int type){
+    char *dataInputsKVP=(char*) malloc(length*sizeof(char));
+    maps* curs=m;
+    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){
+        map* tmp=getMap(curs->content,"value");
+        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);
+      }
+      int j=0;
+      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);
+        }
+        icurs=icurs->next;
+      }
+      curs=curs->next;
+      i++;
+    }
+    return dataInputsKVP;
+  }
+
 
   static void freeMap(map** mo){
@@ -516 +581 @@
       map* _ztmpm=getMap(_tmpm->content,subkey);
       if(_ztmpm!=NULL){
-        free(_ztmpm->value);
+        if(_ztmpm->value!=NULL)
+          free(_ztmpm->value);
         _ztmpm->value=strdup(value);
       }else{