Changeset 88

Timestamp:

Jan 26, 2011, 4:13:35 PM (14 years ago)

Author:

djay

Message:

Special thanks to Soeren Gebbert for his proposals. Add the inRequest key to the inputs/outputs maps for specifying if an input/output was present in the request or not (required to remove the PyXB dependency from GRASS Support). Add the automatic base64 decoding for input provided as base64 encoded string, in this case a size key will be added (containing the size of the decoded string which is probably a binary file), base64_value will be added to store the original base64 string for possible acces from service function, value will finally contain the decoded string (this was required for supporting requests coming from the QGIS WPS Client).

Location:

trunk/zoo-kernel

Files:

• service_internal.c (modified) (3 diffs)
• service_internal.h (modified) (1 diff)
• zoo_service_loader.c (modified) (1 diff)

trunk/zoo-kernel/service_internal.c

@@ -1758 +1758 @@
 }
 
+char *base64d(unsigned char *input, int length,int* red)
+{
+  BIO *b64, *bmem;
+
+  char *buffer = (char *)malloc(length);
+  memset(buffer, 0, length);
+
+  b64 = BIO_new(BIO_f_base64());
+  bmem = BIO_new_mem_buf(input, length);
+  bmem = BIO_push(b64, bmem);
+
+  *red=BIO_read(bmem, buffer, length);
+
+  BIO_free_all(bmem);
+
+  return buffer;
+}
+
+void ensureDecodedBase64(maps **in){
+  maps* cursor=*in;
+  while(cursor!=NULL){
+    map *tmp=getMap(cursor->content,"encoding");
+    if(tmp!=NULL && strncasecmp(tmp->value,"base64",6)==0){
+      tmp=getMap(cursor->content,"value");
+      addToMap(cursor->content,"base64_value",tmp->value);
+      char *s=strdup(tmp->value);
+      free(tmp->value);
+      int size=0;
+      tmp->value=base64d(s,strlen(s),&size);
+      char sizes[1024];
+      sprintf(sizes,"%d",size);
+      addToMap(cursor->content,"size",sizes);
+    }
+    cursor=cursor->next;
+  }
+}
+
 char* addDefaultValues(maps** out,elements* in,maps* m,int type){
   elements* tmpInputs=in;
@@ -1802 +1839 @@
         }
       }
+      addToMap(tmpMaps2->content,"inRequest","false");
       if(type==1){
         map *tmpMap=getMap(tmpMaps2->content,"value");
@@ -1823 +1861 @@
       iotype* tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,
                                              tmpMaps->content);
-
+      addToMap(tmpMaps->content,"inRequest","true");
       if(type==0) {
         /**

trunk/zoo-kernel/service_internal.h

@@ -107 +107 @@
 
   char *base64(const unsigned char*,int);
+  char *base64d(unsigned char*,int,int*);
+  void ensureDecodedBase64(maps**);
 
   char* addDefaultValues(maps**,elements*,maps*,int);

trunk/zoo-kernel/zoo_service_loader.c

@@ -1648 +1648 @@
   addDefaultValues(&request_output_real_format,s1->outputs,m,1);
 
+  ensureDecodedBase64(&request_input_real_format);
+
 #ifdef DEBUG
   fprintf(stderr,"REQUEST_INPUTS\n");