Changeset 485 for trunk

Timestamp:

Jun 3, 2014, 4:58:44 PM (11 years ago)

Author:

djay

Message:

Add support of maximumMegabytes keyword for size limitation of ComplexData? inputs

Location:

trunk

Files:

• docs/services/zcfg-reference.txt (modified) (1 diff)
• testing/run.sh (modified) (1 diff)
• zoo-project/HISTORY.txt (modified) (1 diff)
• zoo-project/zoo-kernel/service_internal.c (modified) (3 diffs)
• zoo-project/zoo-kernel/zoo_service_loader.c (modified) (1 diff)

trunk/docs/services/zcfg-reference.txt

@@ -57 +57 @@
 
 -  a name (between brackets as for the name of the service before)
-- various medata properties (``Title``, ``Abstract``, ``minOccurs`` and ``maxOccurs``)
+- various medata properties (``Title``, ``Abstract``, ``minOccurs``, ``maxOccurs`` and, in case of ComplexData, the optional ``maximumMegabytes``)
 - a Type Of Data node (:ref:`description <typeDataNodes>`)
 

trunk/testing/run.sh

@@ -193 +193 @@
 done
 
-kvpRequest "${WPSInstance}?request=DescribeProcess&service=WPS&Identifier=${ServiceName}" "tmp/outputDPb10.xml" "DescribeProcess"
-
-echo ""
 
 cat requests/dp.xml | sed "s:ServiceName:${ServiceName}:g" > tmp/dp1.xml

trunk/zoo-project/HISTORY.txt

@@ -1 +1 @@
 Version 1.4.0-dev
+  * Add support of maximumMegabytes keywords for ComplexData Inputs
   * Add the optional YAML ZCFG support #4 and the zcfg2yaml converter
   * Return error messages that enable the service provider to quickly identify the root cause of errors due to configuration file syntax (ticket #90)

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

@@ -967 +967 @@
       }else
         xmlNewProp(nc2,BAD_CAST "maxOccurs",BAD_CAST "1");
+      if((tmp1=getMap(e->content,"maximumMegabytes"))!=NULL){
+        xmlNewProp(nc2,BAD_CAST "maximumMegabytes",BAD_CAST tmp1->value);
+      }
     }
 
@@ -2508 +2511 @@
           else
             addToMap(tmpMaps2->content,"maxOccurs",tmpMaxO->value);
+        map* tmpMaxMB=getMap(tmpInputs->content,"maximumMegabytes");
+        if(tmpMaxMB!=NULL)
+          if(tmpMaps2->content==NULL)
+            tmpMaps2->content=createMap("maximumMegabytes",tmpMaxMB->value);
+          else
+            addToMap(tmpMaps2->content,"maximumMegabytes",tmpMaxMB->value);
       }
 
@@ -2558 +2567 @@
         if(tmpMaxO!=NULL){
           if(tmpMaps->content==NULL)
-            tmpMaps->content=createMap("maxOccurs",tmpMap1->value);
+            tmpMaps->content=createMap("maxOccurs",tmpMaxO->value);
           else
-            addToMap(tmpMaps->content,"maxOccurs",tmpMap1->value);
-        }
+            addToMap(tmpMaps->content,"maxOccurs",tmpMaxO->value);
+        }
+        map* tmpMaxMB=getMap(tmpInputs->content,"maximumMegabytes");
+        if(tmpMaxMB!=NULL)
+          if(tmpMaps->content==NULL)
+            tmpMaps->content=createMap("maximumMegabytes",tmpMaxMB->value);
+          else
+            addToMap(tmpMaps->content,"maximumMegabytes",tmpMaxMB->value);
         /**
          * Parsing BoundingBoxData, fill the following map and then add it to

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

@@ -2159 +2159 @@
    */
   char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,0);
+  maps *ptr=request_input_real_format;
+  while(ptr!=NULL){
+    dumpMap(ptr->content);
+    map *tmp0=getMap(ptr->content,"size");
+    map *tmp1=getMap(ptr->content,"maximumMegabytes");
+    if(tmp1!=NULL && tmp0!=NULL){
+      float i=atof(tmp0->value)/1048576.0;
+      if(i>=atoi(tmp1->value)){
+        char tmps[1024];
+        map* tmpe=createMap("code","FileSizeExceeded");
+        snprintf(tmps,1024,_("The <%s> parameter has a limited size (%sMB) defined in ZOO ServicesProvider configuration file but the reference you provided exceed this limitation (%dMB), please correct your query or the ZOO Configuration file."),ptr->name,tmp1->value,i);
+        addToMap(tmpe,"locator",ptr->name);
+        addToMap(tmpe,"text",tmps);
+        printExceptionReportResponse(m,tmpe);
+        freeService(&s1);
+        free(s1);
+        freeMap(&tmpe);
+        free(tmpe);
+        freeMaps(&m);
+        free(m);
+        free(REQUEST);
+        free(SERVICE_URL);
+        freeMaps(&request_input_real_format);
+        free(request_input_real_format);
+        freeMaps(&request_output_real_format);
+        free(request_output_real_format);
+        freeMaps(&tmpmaps);
+        free(tmpmaps);
+        return 1;
+      }
+    }
+    ptr=ptr->next;
+  }
+
   char *dfv1=addDefaultValues(&request_output_real_format,s1->outputs,m,1);
   if(strcmp(dfv1,"")!=0 || strcmp(dfv,"")!=0){