Changeset 383 for trunk/zoo-project/zoo-kernel/service_internal.c

Timestamp:

Jan 8, 2013, 3:54:57 PM (11 years ago)

Author:

djay

Message:

Fix issue in JS support and for binary RawDataOutput?. Add Content-Length and Content-Disposition (optional) to response header. Add support to JS ZOO-API for sending headers and handling multi-valued inputs.

File:

• trunk/zoo-project/zoo-kernel/service_internal.c (modified) (5 diffs)

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

@@ -1745 +1745 @@
   xmlNodePtr n;
 
+  printHeaders(m);
   doc = xmlNewDoc(BAD_CAST "1.0");
   maps* tmpMap=getMaps(m,"main");
@@ -1899 +1900 @@
           // mimeType information if present here. Maybe we can add more formats
           // here.
-          // If mimeType was not found, we then set txt as the default extension.
+          // If mimeType was not found, we then set txt as the default extension
           map* mtype=getMap(tmpI->content,"mimeType");
           if(mtype!=NULL){
@@ -1919 +1920 @@
         file_name=(char*)malloc((strlen(tmp1->value)+strlen(s->name)+strlen(ext->value)+strlen(tmpI->name)+13)*sizeof(char));
         sprintf(file_name,"%s/%s_%s_%i.%s",tmp1->value,s->name,tmpI->name,cpid+100000,ext->value);
-        FILE *ofile=fopen(file_name,"w");
+        FILE *ofile=fopen(file_name,"wb");
         if(ofile==NULL)
           fprintf(stderr,"Unable to create file on disk implying segfault ! \n");
@@ -2000 +2001 @@
           return;
         }
+        map* fname=getMapFromMaps(tmpI,tmpI->name,"filename");
+        if(fname!=NULL)
+          printf("Content-Disposition: attachment; filename=\"%s\"\r\n",fname->value);
+        map* rs=getMapFromMaps(tmpI,tmpI->name,"size");
+        if(rs!=NULL)
+          printf("Content-Length: %s\r\n",rs->value);
+
         char mime[1024];
         map* mi=getMap(tmpI->content,"mimeType");
@@ -2020 +2028 @@
             sprintf(mime,"Content-Type: text/plain; charset=utf-8\r\nStatus: 200 OK\r\n\r\n");
         printf("%s",mime);
-        if(mi!=NULL && strncmp(mi->value,"image",5)==0){
-          map* rs=getMapFromMaps(tmpI,tmpI->name,"size");
+        if(rs!=NULL)
           fwrite(toto->value,atoi(rs->value),1,stdout);
-        }
         else
-          printf("%s",toto->value);
+          fwrite(toto->value,strlen(toto->value),1,stdout);
 #ifdef DEBUG
         dumpMap(toto);