Changeset 362 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Aug 7, 2012, 12:28:05 PM (12 years ago)

Author:

djay

Message:

Fix multiple values for the same identifier.

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -99 +99 @@
  */
 int appendMapsToMaps(maps* m,maps* mo,maps* mi,elements* elem){
-
-  map* tmap=getMapType(mo->content);
+  maps* tmpMaps=getMaps(mo,mi->name);
+  map* tmap=getMapType(tmpMaps->content);
+  elements* el=getElements(elem,mi->name);
+  int hasEl=1;
+  if(el==NULL)
+    hasEl=-1;
   if(tmap==NULL){
-    tmap=getMapType(elem->defaults->content);
-  }
-
-  map* testMap=getMap(elem->content,"maxOccurs");
+    if(hasEl>0)
+      tmap=getMapType(el->defaults->content);      
+  }
+
+  map* testMap=NULL;
+  if(hasEl>0){
+    testMap=getMap(el->content,"maxOccurs");
+  }else{
+    testMap=createMap("maxOccurs","unbounded");
+  }
+
   if(testMap!=NULL){
     if(strncasecmp(testMap->value,"unbounded",9)!=0 && atoi(testMap->value)>1){
@@ -116 +127 @@
     }else{
       if(strncasecmp(testMap->value,"unbounded",9)==0){
+        if(hasEl<0){
+          freeMap(&testMap);
+          free(testMap);
+        }
         if(addMapsArrayToMaps(&mo,mi,tmap->name)<0){
           char emsg[1024];