Changeset 92

Timestamp:

Jan 27, 2011, 11:47:22 PM (13 years ago)

Author:

djay

Message:

Give ZOO-Services capabilities to return a Cookie to the client and to store persistent informations, using senv maps in main_conf, on the server side. Bug fix in addDefaultValues.

Location:

trunk/zoo-kernel

Files:

• service.h (modified) (2 diffs)
• service_conf.y (modified) (1 diff)
• service_internal.c (modified) (3 diffs)
• zoo_service_loader.c (modified) (2 diffs)

trunk/zoo-kernel/service.h

@@ -103 +103 @@
   }
 
+  static void dumpMapToFile(map* t,FILE* file){
+    map* tmp=t;
+    while(tmp!=NULL){
+      fprintf(file,"%s = %s\n",t->name,t->value);
+      tmp=tmp->next;
+    }
+  }
+
   static void dumpMaps(maps* m){
     maps* tmp=m;
@@ -109 +117 @@
       dumpMap(tmp->content);
       tmp=tmp->next;
+    }
+  }
+
+  static void dumpMapsToFile(maps* m,FILE* file){
+    maps* tmp=m;
+    if(tmp!=NULL){
+      fprintf(file,"[%s]\n",tmp->name);
+      dumpMapToFile(tmp->content,file);
     }
   }

trunk/zoo-kernel/service_conf.y

@@ -650 +650 @@
             else
               addToElements(&my_service->outputs,current_element);
+#ifdef DEBUG_SERVICE_CONF
             fprintf(stderr,"ADD TO OUTPUTS Elements\n");
             dupElements(current_element);
-
+#endif
             freeElements(&current_element);
             free(current_element);

trunk/zoo-kernel/service_internal.c

@@ -1576 +1576 @@
     asRaw=1;
   
+  map *_tmp=getMapFromMaps(m,"lenv","cookie");
+  if(_tmp!=NULL){
+    printf("Set-Cookie: %s\r\n",_tmp->value);
+    maps *tmpSess=getMaps(m,"senv");
+    if(tmpSess!=NULL){
+      char session_file_path[1024];
+      map *tmpPath=getMapFromMaps(m,"main","sessPath");
+      if(tmpPath==NULL)
+        tmpPath=getMapFromMaps(m,"main","tmpPath");
+      char *tmp1=strtok(_tmp->value,";");
+      if(tmp1!=NULL)
+        sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(tmp1,"=")+1);
+      else
+        sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(_tmp->value,"=")+1);
+      FILE* file=fopen(session_file_path,"w");
+      dumpMapsToFile(tmpSess,file);
+      fclose(file);
+    }
+  }
   if(asRaw==0){
 #ifdef DEBUG
@@ -1861 +1880 @@
       iotype* tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,
                                              tmpMaps->content);
-      addToMap(tmpMaps->content,"inRequest","true");
       if(type==0) {
         /**
@@ -1924 +1942 @@
         }
       }
+      if(tmpMaps->content==NULL)
+        tmpMaps->content=createMap("inRequest","true");
+      else
+        addToMap(tmpMaps->content,"inRequest","true");
     }
     tmpInputs=tmpInputs->next;

trunk/zoo-kernel/zoo_service_loader.c

@@ -1622 +1622 @@
    * Ensure that each requested arguments are present in the request
    * DataInputs and ResponseDocument / RawDataOutput
-   */  
+   */
   char *dfv=addDefaultValues(&request_input_real_format,s1->inputs,m,0);
   if(strcmp(dfv,"")!=0){
@@ -1739 +1739 @@
   _tmpMaps->next=NULL;
   addToMap(_tmpMaps->content,"status","0");
+  if(cgiCookie!=NULL && strlen(cgiCookie)>0){
+    addToMap(_tmpMaps->content,"sessid",strstr(cgiCookie,"=")+1);
+    char session_file_path[1024];
+    map *tmpPath=getMapFromMaps(m,"main","sessPath");
+    if(tmpPath==NULL)
+      tmpPath=getMapFromMaps(m,"main","tmpPath");
+    sprintf(session_file_path,"%s/sess_%s.cfg",tmpPath->value,strstr(cgiCookie,"=")+1);
+    maps *tmpSess=(maps*)calloc(1,MAPS_SIZE);
+    struct stat file_status;
+    int istat = stat(session_file_path, &file_status);
+    if(istat==0){
+      conf_read(session_file_path,tmpSess);
+      dumpMaps(tmpSess);
+      addMapsToMaps(&m,tmpSess);
+      freeMaps(&tmpSess);
+    }
+    free(tmpSess);
+  }
   addMapsToMaps(&m,_tmpMaps);
   freeMaps(&_tmpMaps);