Changeset 63

Timestamp:

Jan 8, 2011, 1:01:25 AM (14 years ago)

Author:

djay

Message:

Remove memory leaks. Add support for minOccurs and maxOccurs informations in the inputs maps to close ticket #12.

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (7 diffs)
• service_internal.h (modified) (1 diff)
• service_internal_python.c (modified) (1 diff)
• zoo_service_loader.c (modified) (6 diffs)

trunk/zoo-kernel/service_internal.c

@@ -1160 +1160 @@
     maps* mcursor=outputs;
     elements* scursor=serv->outputs;
-    while(mcursor!=NULL && scursor!=NULL){
+    while(mcursor!=NULL){
       printIOType(doc,nc,ns,ns_ows,scursor,mcursor,"Output");
       mcursor=mcursor->next;
-      scursor=scursor->next;
     }
     xmlAddChild(n,nc);
@@ -1533 +1532 @@
             toto=createMap("extension","txt");
         }
-        if(toto==NULL)
+        else
           toto=createMap("extension","txt");
         hasExt=false;
@@ -1649 +1648 @@
 }
 
-char* addDefaultValues(maps** out,elements* in,maps* m,char* type){
+char* addDefaultValues(maps** out,elements* in,maps* m,int type){
   elements* tmpInputs=in;
   maps* out1=*out;
@@ -1655 +1654 @@
     maps *tmpMaps=getMaps(out1,tmpInputs->name);
     if(tmpMaps==NULL){
-      map* tmpMap1=getMap(tmpInputs->content,"minOccurs");
-      if(strncmp(type,"inputs",6)==0)
-        if(tmpMap1!=NULL && atoi(tmpMap1->value)>=1){
-          return tmpInputs->name;
-        }
       maps* tmpMaps2=(maps*)malloc(MAPS_SIZE);
       tmpMaps2->name=strdup(tmpInputs->name);
       tmpMaps2->content=NULL;
       tmpMaps2->next=NULL;
+      
+      if(type==0){
+        map* tmpMapMinO=getMap(tmpInputs->content,"minOccurs");
+        if(tmpMapMinO!=NULL)
+          if(atoi(tmpMapMinO->value)>=1){
+            freeMaps(&tmpMaps2);
+            free(tmpMaps2);
+            return tmpInputs->name;
+          }
+          else{
+            if(tmpMaps2->content==NULL)
+              tmpMaps2->content=createMap("minOccurs",tmpMapMinO->value);
+            else
+              addToMap(tmpMaps2->content,"minOccurs",tmpMapMinO->value);
+          }
+        map* tmpMaxO=getMap(tmpInputs->content,"maxOccurs");
+        if(tmpMaxO!=NULL)
+          if(tmpMaps2->content==NULL)
+            tmpMaps2->content=createMap("maxOccurs",tmpMaxO->value);
+          else
+            addToMap(tmpMaps2->content,"maxOccurs",tmpMaxO->value);
+      }
+
       iotype* tmpIoType=tmpInputs->defaults;
-      while(tmpIoType!=NULL){
-        addMapToMap(&tmpMaps2->content,tmpIoType->content);
-        tmpIoType=tmpIoType->next;
-      }
-      if(strncmp(type,"outputs",7)==0){
+      if(tmpIoType!=NULL){
+        map* tmpm=tmpIoType->content;
+        while(tmpm!=NULL){
+          if(tmpMaps2->content==NULL)
+            tmpMaps2->content=createMap(tmpm->name,tmpm->value);
+          else
+            addToMap(tmpMaps2->content,tmpm->name,tmpm->value);
+          tmpm=tmpm->next;
+        }
+      }
+      if(type==1){
         map *tmpMap=getMap(tmpMaps2->content,"value");
         if(tmpMap==NULL)
@@ -1676 +1699 @@
       if(out1==NULL){
         *out=dupMaps(&tmpMaps2);
+        out1=*out;
       }
       else
         addMapsToMaps(&out1,tmpMaps2);
+      freeMap(&tmpMaps2->content);
+      free(tmpMaps2->content);
+      tmpMaps2->content=NULL;
       freeMaps(&tmpMaps2);
       free(tmpMaps2);
@@ -1686 +1713 @@
       iotype* tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,
                                              tmpMaps->content);
+
+      if(type==0) {
+        map* tmpMap1=getMap(tmpInputs->content,"minOccurs");
+        if(tmpMap1!=NULL){
+          if(tmpMaps->content==NULL)
+            tmpMaps->content=createMap("minOccurs",tmpMap1->value);
+          else
+            addToMap(tmpMaps->content,"minOccurs",tmpMap1->value);
+        }
+        map* tmpMaxO=getMap(tmpInputs->content,"maxOccurs");
+        if(tmpMaxO!=NULL){
+          if(tmpMaps->content==NULL)
+            tmpMaps->content=createMap("maxOccurs",tmpMap1->value);
+          else
+            addToMap(tmpMaps->content,"maxOccurs",tmpMap1->value);
+        }
+      }
+
       if(tmpIoType!=NULL){
         map* tmpContent=tmpIoType->content;
@@ -1695 +1740 @@
             fprintf(stderr,"addDefaultValues %s => %s\n",tmpContent->name,tmpContent->value);
 #endif
-              if(tmpMaps->content==NULL)
-                tmpMaps->content=createMap(tmpContent->name,tmpContent->value);
-              else
-                addToMap(tmpMaps->content,tmpContent->name,tmpContent->value);
+            if(tmpMaps->content==NULL)
+              tmpMaps->content=createMap(tmpContent->name,tmpContent->value);
+            else
+              addToMap(tmpMaps->content,tmpContent->name,tmpContent->value);
           }
           tmpContent=tmpContent->next;

trunk/zoo-kernel/service_internal.h

@@ -104 +104 @@
   char *base64(const unsigned char*,int);
 
-  char* addDefaultValues(maps**,elements*,maps*,char*);
+  char* addDefaultValues(maps**,elements*,maps*,int);
 
   /*defined in zoo_loader.c*/ 

trunk/zoo-kernel/service_internal_python.c

@@ -34 +34 @@
   tmp=getMapFromMaps(*main_conf,"env","PYTHONPATH");
   char *python_path;
+#ifdef DEBUG
   fprintf(stderr,"PYTHON SUPPORT \n");
+#endif
   fflush(stderr);
   if(tmp!=NULL){
+#ifdef DEBUG
     fprintf(stderr,"PYTHON SUPPORT (%i)\n",strlen(tmp->value));
+#endif
     python_path=(char*)malloc((strlen(tmp->value))*sizeof(char));
     sprintf(python_path,"%s",tmp->value);

trunk/zoo-kernel/zoo_service_loader.c

@@ -27 +27 @@
 extern "C" int yylex();
 extern "C" int crlex();
-
 
 extern "C" {
@@ -472 +471 @@
     SERVICE_URL=strdup(tmpm->value);
   else
-    SERVICE_URL=DEFAULT_SERVICE_URL;
+    SERVICE_URL=strdup(DEFAULT_SERVICE_URL);
 
   service* s[100];
@@ -1614 +1613 @@
    * DataInputs and ResponseDocument / RawDataOutput
    */  
-  char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,"inputs");
+  char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,0);
   if(strcmp(dfv,"")!=0){
     char tmps[1024];
@@ -1621 +1620 @@
     addToMap(tmpe,"code","MissingParameterValue");
     printExceptionReportResponse(m,tmpe);
+    freeService(&s1);
+    free(s1);
     freeMap(&tmpe);
     free(tmpe);
@@ -1626 +1627 @@
     free(m);
     free(REQUEST);
+    free(SERVICE_URL);
     freeMaps(&request_input_real_format);
     free(request_input_real_format);
@@ -1634 +1636 @@
     return 1;
   }
-  addDefaultValues(&request_output_real_format,s1->outputs,m,"outputs");
+  addDefaultValues(&request_output_real_format,s1->outputs,m,1);
 
 #ifdef DEBUG