Changeset 623 for trunk/zoo-project/zoo-kernel

Timestamp:

Apr 9, 2015, 6:33:14 PM (9 years ago)

Author:

djay

Message:

Fix issue when adding map with size in a map array.

Location:

trunk/zoo-project/zoo-kernel

Files:

• request_parser.c (modified) (7 diffs)
• service.h (modified) (2 diffs)
• service_internal.c (modified) (1 diff)
• service_internal_ms.c (modified) (1 diff)
• service_internal_python.c (modified) (2 diffs)

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

@@ -292 +292 @@
                   }
                 else
-                  addMapsToMaps (&(*request_output), tmpmaps);
+                  addMapsToMaps (request_output, tmpmaps);
               }
             freeMaps (&tmpmaps);
@@ -403 +403 @@
             *request_output = dupMaps (&tmp_output);
           else
-            addMapsToMaps (&(*request_output), tmp_output);
+            addMapsToMaps (request_output, tmp_output);
           freeMaps (&tmp_output);
           free (tmp_output);
@@ -530 +530 @@
                                 {
                                   if (loadRemoteFile
-                                      (&(*main_conf), &tmpmaps->content, hInternet,
+                                      (main_conf, &tmpmaps->content, hInternet,
                                        (char *) val) != 0)
                                     {
@@ -647 +647 @@
                                       if (btmp != NULL)
                                         {
-                                          addRequestToQueue(&(*main_conf),hInternet,(char *) btmp->value,false);
+                                          addRequestToQueue(main_conf,hInternet,(char *) btmp->value,false);
                                           InternetOpenUrl (hInternet,
                                                            btmp->value,
@@ -714 +714 @@
                                 if (btmp != NULL)
                                   {
-                                    addRequestToQueue(&(*main_conf),hInternet,(char *) btmp->value,false);
+                                    addRequestToQueue(main_conf,hInternet,(char *) btmp->value,false);
 
                                     res =
@@ -939 +939 @@
               }
             else
-              addMapsToMaps (&(*request_output), tmpmaps);
+              addMapsToMaps (request_output, tmpmaps);
           }
           freeMaps (&tmpmaps);
@@ -1021 +1021 @@
             *request_output = dupMaps (&tmpmaps);
           else
-            addMapsToMaps (&(*request_output), tmpmaps);
+            addMapsToMaps (request_output, tmpmaps);
           if (tmpmaps != NULL)
             {

trunk/zoo-project/zoo-kernel/service.h

@@ -653 +653 @@
       }
     }
+    char sname[10]="size";
+    if(strlen(n)>5)
+      sprintf(sname,"size_%s",n+6);
     map *tmp=getMap(m,n);
     if(tmp->value!=NULL)
@@ -661 +664 @@
     char sin[128];
     sprintf(sin,"%d",size);
-    addToMap(m,"size",sin);
+    addToMap(m,sname,sin);
   }
 

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

@@ -3704 +3704 @@
 void addRequestToQueue(maps** m,HINTERNET* hInternet,const char* url,bool req){
   hInternet->waitingRequests[hInternet->nb]=strdup(url);
+  hInternet->ihandle[hInternet->nb].header=NULL;
   if(req)
     InternetOpenUrl(hInternet,hInternet->waitingRequests[hInternet->nb],NULL,0,INTERNET_FLAG_NO_CACHE_WRITE,0);

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

@@ -430 +430 @@
   char *odsName=zStrdup(pszDataSource);
   char *sdsName=zStrdup(pszDataSource);
-  char *demo=strstr(odsName,".");
+  char *demo=".data";
   sdsName[strlen(sdsName)-(strlen(demo)-1)]='d';
   sdsName[strlen(sdsName)-(strlen(demo)-2)]='i';

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

@@ -581 +581 @@
 #endif
     
-    if(strcmp(PyString_AsString(key),"value")==0){
+    if(strncmp(PyString_AsString(key),"value",5)==0){
       char *buffer=NULL;
       Py_ssize_t size;
@@ -589 +589 @@
       PyString_AsStringAndSize(value,&buffer,&size);
 #endif
-      addToMapWithSize(res,"value",buffer,size);
+      addToMapWithSize(res,PyString_AsString(key),buffer,size);
     }else{
       char* lkey=PyString_AsString(key);