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

Timestamp:

Jan 5, 2011, 3:20:01 PM (13 years ago)

Author:

djay

Message:

Adding contains and getIoTypeFromElement functions in service.h. Remove memory leaks from the Service Configuration Parser, add the support for multiple supported formats as before. Small modification of the ZOO-Kernel Java Support, adding the capability to access the modified main_conf HashMap? from the Kernel to let lenv message map pass when an error occurs and it is handled in the Service code. Adding same capability for the ZOO-Kernel Python Support. Use strcasecmp in service.h rather than strlen+strncasecmp. Ensure that only OWS compliant informations are available for Contact.Phone and Contact.Adress. Remove memory leak in createExceptionReportNode. Correction of the addDefaultValues function to add the default format using the informations from DataInputs? if present, this should correct the behavior of the ZOO-Kernel when choosing the extension value which should now point to the corresponding zcfg value if present. Don't set the NULL value for inputs not provided in the DataInputs?, still set NULL as default value for outputs. Avoid segfault in freeElements when some zcfg values was not set correctly. Link against the client libjvm.so file rather than the server one.

File:

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

trunk/zoo-kernel/service.h

@@ -133 +133 @@
     map* tmp=m;
     while(tmp!=NULL){
-      if(strlen(tmp->name)==strlen(key) && strncasecmp(tmp->name,key,strlen(key))==0)
+      if(strcasecmp(tmp->name,key)==0)
         return true;
       tmp=tmp->next;
@@ -146 +146 @@
     maps* tmp=m;
     while(tmp!=NULL){
-      if(strlen(tmp->name)==strlen(key) && strncasecmp(tmp->name,key,strlen(key))==0){
+      if(strcasecmp(tmp->name,key)==0){
         return tmp;
       }
@@ -157 +157 @@
     map* tmp=m;
     while(tmp!=NULL){
-      if(strlen(tmp->name)==strlen(key) && strncasecmp(tmp->name,key,strlen(key))==0){
+      if(strcasecmp(tmp->name,key)==0){
         return tmp;
       }
@@ -239 +239 @@
     elements* tmp=e;
     while(tmp!=NULL){
-      if(strlen(tmp->name)==strlen(key) && strncasecmp(key,tmp->name,strlen(key))==0)
+      if(strcasecmp(key,tmp->name)==0)
         return true;
       tmp=tmp->next;
@@ -249 +249 @@
     elements* tmp=m;
     while(tmp!=NULL){
-      if(strlen(tmp->name)==strlen(key) && strncasecmp(tmp->name,key,strlen(tmp->name))==0)
+      if(strcasecmp(tmp->name,key)==0)
         return tmp;
       tmp=tmp->next;
@@ -260 +260 @@
     iotype* _cursor=*i;
     if(_cursor!=NULL){
-      freeMap(&_cursor->content);
-      free(_cursor->content);
       if(_cursor->next!=NULL){
         freeIOType(&_cursor->next);
         free(_cursor->next);
       }
+      freeMap(&_cursor->content);
+      free(_cursor->content);
     }
   }
@@ -272 +272 @@
     elements* tmp=*e;
     if(tmp!=NULL){
-      free(tmp->name);
+      if(tmp->name!=NULL)
+        free(tmp->name);
       freeMap(&tmp->content);
-      free(tmp->content);
+      if(tmp->content!=NULL)
+        free(tmp->content);
       freeMap(&tmp->metadata);
-      free(tmp->metadata);
-      free(tmp->format);
+      if(tmp->metadata!=NULL)
+        free(tmp->metadata);
+      if(tmp->format!=NULL)
+        free(tmp->format);
       freeIOType(&tmp->defaults);
       if(tmp->defaults!=NULL)
         free(tmp->defaults);
       freeIOType(&tmp->supported);
-      if(tmp->supported!=NULL)
+      if(tmp->supported!=NULL){
         free(tmp->supported);
+      }
       freeElements(&tmp->next);
     }
@@ -361 +366 @@
   static void addMapToIoType(iotype** io,map* mi){
     iotype* tmp=*io;
-    while(tmp!=NULL){
-#ifdef DEBUG
-      fprintf(stderr,">> CURRENT MAP");
-      dumpMap(tmp->content);
-#endif
-      tmp=tmp->next;
-    }
-#ifdef DEBUG
-    fprintf(stderr,">> %s %i\n",__FILE__,__LINE__);
-    fflush(stderr);
-#endif
-    tmp=(iotype*)malloc(IOTYPE_SIZE);
-#ifdef DEBUG
-    fprintf(stderr,">> %s %i\n",__FILE__,__LINE__);
-    fflush(stderr);
-#endif
-    tmp->content=NULL;
-#ifdef DEBUG
-    fprintf(stderr,">> %s %i\n",__FILE__,__LINE__);
-    fflush(stderr);
-#endif
-    addMapToMap(&tmp->content,mi);
-#ifdef DEBUG
-    fprintf(stderr,">> %s %i\n",__FILE__,__LINE__);
-    fflush(stderr);
-#endif
-    dumpMap(tmp->content);
-    tmp->next=NULL;
-  }
-
+    while(tmp->next!=NULL){
+      tmp=tmp->next;
+    }
+    tmp->next=(iotype*)malloc(IOTYPE_SIZE);
+    tmp->next->content=NULL;
+    addMapToMap(&tmp->next->content,mi);
+    tmp->next->next=NULL;
+  }
+
+  static bool contains(map* m,map* i){
+    while(i!=NULL){      
+      if(strcasecmp(i->name,"value")!=0 &&
+         strcasecmp(i->name,"xlink:href")!=0){
+        map *tmp;
+        if(hasKey(m,i->name) && (tmp=getMap(m,i->name))!=NULL && 
+           strcasecmp(i->value,tmp->value)!=0)
+          return false;
+      }
+      i=i->next;
+    }
+    return true;
+  }
+
+  static iotype* getIoTypeFromElement(elements* e,char *name, map* values){
+    elements* cursor=e;
+    while(cursor!=NULL){
+      if(strcasecmp(cursor->name,name)==0){
+        if(contains(cursor->defaults->content,values)==true)
+          return cursor->defaults;
+        else{
+          iotype* tmp=cursor->supported;
+          while(tmp!=NULL){
+            if(contains(tmp->content,values)==true)
+              return tmp;           
+            tmp=tmp->next;
+          }
+        }
+      }
+      cursor=cursor->next;
+    }
+    return NULL;
+  }
 
   static maps* dupMaps(maps** mo){
@@ -434 +451 @@
         free(_ztmpm->value);
         _ztmpm->value=strdup(value);
-        dumpMap(_ztmpm);
       }else{
         addToMap(_tmpm->content,subkey,value);
@@ -502 +518 @@
         tmp->supported=(iotype*)malloc(IOTYPE_SIZE);
         tmp->supported->content=NULL;
+        addMapToMap(&tmp->supported->content,e->supported->content);
         tmp->supported->next=NULL;
-        addMapToMap(&tmp->supported->content,e->supported->content);
-        iotype *etmp=*(&tmp->supported->next) ;
         iotype *tmp2=e->supported->next;
         while(tmp2!=NULL){
-          etmp=(iotype*)malloc(IOTYPE_SIZE);
-          etmp->content=NULL;
-          addMapToMap(&etmp->content,tmp2->content);
-          etmp->next=NULL;
+          addMapToIoType(&tmp->supported,tmp2->content);
 #ifdef DEBUG
           fprintf(stderr,">> %s %i\n",__FILE__,__LINE__);
@@ -516 +528 @@
 #endif
           tmp2=tmp2->next;
-          etmp=etmp->next;
         }
       }
@@ -532 +543 @@
       *m=dupElements(tmp);
     }else{
-      while(_cursor->next!=NULL)
-        _cursor=_cursor->next;
-      _cursor->next=dupElements(tmp);
+      addToElements(&(*m)->next,tmp);
     }
   }