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

Timestamp:

Jun 7, 2012, 10:54:31 PM (12 years ago)

Author:

djay

Message:

Add support for multiple inputs values for the same identifier.

File:

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

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

@@ -2 +2 @@
  * Author : Gérald FENOY
  *
- *  Copyright 2008-2011 GeoLabs SARL. All rights reserved.
+ *  Copyright 2008-2012 GeoLabs SARL. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -92 +92 @@
       str[i]=toReplaceBy;
   }
+}
+
+/**
+ * Create (or append to) an array valued maps
+ * value = "["",""]"
+ */
+int appendMapsToMaps(maps* m,maps* mo,maps* mi,elements* elem){
+
+  map* tmap=getMapType(mo->content);
+  if(tmap==NULL){
+    tmap=getMapType(elem->defaults->content);
+  }
+
+  map* testMap=getMap(elem->content,"maxOccurs");
+  if(testMap!=NULL){
+    if(strncasecmp(testMap->value,"unbounded",9)!=0 && atoi(testMap->value)>1){
+      if(addMapsArrayToMaps(&mo,mi,tmap->name)<0){
+        char emsg[1024];
+        sprintf(emsg,_("You set maximum occurences for <%s> as %i but you tried to use it more than the limit you set. Please correct your ZCFG file or your request."),mi->name,atoi(testMap->value));
+        errorException(m,emsg,"InternalError");
+        return -1;
+      }
+    }else{
+      if(strncasecmp(testMap->value,"unbounded",9)==0){
+        if(addMapsArrayToMaps(&mo,mi,tmap->name)<0){
+          char emsg[1024];
+          map* tmpMap=getMap(mi->content,"length");
+          sprintf(emsg,_("ZOO-Kernel was unable to load your data for %s position %s."),mi->name,tmpMap->value);
+          errorException(m,emsg,"InternalError");
+          return -1;
+        }
+      }
+      else{
+        char emsg[1024];
+        sprintf(emsg,_("You set maximum occurences for <%s> to one but you tried to use it more than once. Please correct your ZCFG file or your request."),mi->name);
+        errorException(m,emsg,"InternalError");
+        return -1;
+      }
+    }
+  }
+  return 0;
 }
 
@@ -1068 +1109 @@
         if(request_input_real_format==NULL)
           request_input_real_format=dupMaps(&tmpmaps);
-        else
-          addMapsToMaps(&request_input_real_format,tmpmaps);
+        else{
+          maps* testPresence=getMaps(request_input_real_format,tmpmaps->name);
+          if(testPresence!=NULL){
+            elements* elem=getElements(s1->inputs,tmpmaps->name);
+            if(elem!=NULL){
+              if(appendMapsToMaps(m,request_input_real_format,tmpmaps,elem)<0){
+                freeMaps(&m);
+                free(m);
+                free(REQUEST);
+                free(SERVICE_URL);
+                InternetCloseHandle(hInternet);
+                freeService(&s1);
+                free(s1);
+                return 0;
+              }
+            }
+          }
+          else
+            addMapsToMaps(&request_input_real_format,tmpmaps);
+        }
         freeMaps(&tmpmaps);
         free(tmpmaps);
@@ -1479 +1538 @@
         fflush(stderr);
 #endif
-        addMapsToMaps(&request_input_real_format,tmpmaps);
+
+        {
+          maps* testPresence=getMaps(request_input_real_format,tmpmaps->name);
+          if(testPresence!=NULL){
+            elements* elem=getElements(s1->inputs,tmpmaps->name);
+            if(elem!=NULL){
+              if(appendMapsToMaps(m,request_input_real_format,tmpmaps,elem)<0){
+                freeMaps(&m);
+                free(m);
+                free(REQUEST);
+                free(SERVICE_URL);
+                InternetCloseHandle(hInternet);
+                freeService(&s1);
+                free(s1);
+                return 0;
+              }
+            }
+          }
+          else
+            addMapsToMaps(&request_input_real_format,tmpmaps);
+        }
         
 #ifdef DEBUG