Changeset 871 for branches

Timestamp:

Feb 27, 2018, 4:17:05 PM (7 years ago)

Author:

djay

Message:

Use curl_multi_wait only in case libcurl minor version number is upper or equal to 28.

Location:

branches/prototype-v0/zoo-project/zoo-kernel

Files:

• request_parser.c (modified) (5 diffs)
• service.c (modified) (2 diffs)
• ulinet.c (modified) (1 diff)
• ulinet.h (modified) (1 diff)

branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

@@ -933 +933 @@
                                     tmpmaps->content =
                                       createMap (list[l], (char *) val);
+                                  xmlFree (val);
                                 }
-                              xmlFree (val);
+                              else{
+                                if(l==0){
+                                  if (tmpmaps->content != NULL)
+                                    addToMap (tmpmaps->content, list[l],
+                                              "string");
+                                  else
+                                    tmpmaps->content =
+                                      createMap (list[l],"string");
+                                }
+                              }
                               free (list[l]);
                             }
@@ -959 +969 @@
                                       tmpmaps->content =
                                         createMap (coms[l], (char *) val);
+                                    xmlFree (val);
                                   }
-                                xmlFree (val);
                               }
                           }
 
                       map *test = getMap (tmpmaps->content, "encoding");
-
+                      
                       if (test == NULL)
-                        { 
+                        {
                           if (tmpmaps->content != NULL)
                             addToMap (tmpmaps->content, "encoding",
@@ -977 +987 @@
                         }
 
-                      if (strcasecmp (test->value, "base64") != 0)
+                      if (getMap(tmpmaps->content,"dataType")==NULL && test!=NULL && strcasecmp (test->value, "base64") != 0)
                         {
                           xmlChar *mv = xmlNodeListGetString (doc,
@@ -983 +993 @@
                                                               1);
                           map *ltmp =
-                            getMap (tmpmaps->content, "mimeType");
+                            getMap (tmpmaps->content, "mimeType");                        
                           if (mv == NULL
                               ||
@@ -1068 +1078 @@
                       else
                         {
-                          xmlChar *tmp = xmlNodeListGetRawString (doc,
-                                                                  cur4->xmlChildrenNode,
-                                                                  0);
-                          addToMap (tmpmaps->content, "value",
-                                    (char *) tmp);
-                          xmlFree (tmp);
+                          xmlNodePtr cur5 = cur4->children;
+                          while (cur5 != NULL
+                                 && cur5->type != XML_CDATA_SECTION_NODE)
+                            cur5 = cur5->next;
+                          if (cur5 != NULL
+                              && cur5->type == XML_CDATA_SECTION_NODE)
+                            {
+                              addToMap (tmpmaps->content,
+                                        "value",
+                                        (char *) cur5->content);
+                            }
+                          else{
+                            if(cur4->xmlChildrenNode!=NULL){
+                              xmlChar *tmp = xmlNodeListGetRawString (doc,
+                                                                      cur4->xmlChildrenNode,
+                                                                      0);
+                              addToMap (tmpmaps->content, "value",
+                                        (char *) tmp);
+                              xmlFree (tmp);
+                            }
+                          }
                         }
 

branches/prototype-v0/zoo-project/zoo-kernel/service.c

@@ -925 +925 @@
   }
 
-  char *tmpV[12]={
+  char *tmpV[14]={
     (char*)"size",
     (char*)"value",
@@ -937 +937 @@
     (char*)"schema",
     (char*)"encoding",
-    (char*)"isCached"
+    (char*)"isCached",
+    (char*)"LowerCorner",
+    (char*)"UpperCorner"
   };
   sprintf(tmpLen,"%d",len+1);
   addToMap(_cursor->content,"length",tmpLen);
   int i=0;
-  for(i=0;i<12;i++){
+  for(i=0;i<14;i++){
     map* tmpVI=getMap(tmp->content,tmpV[i]);
     if(tmpVI!=NULL){

branches/prototype-v0/zoo-project/zoo-kernel/ulinet.c

@@ -561 +561 @@
     mc = curl_multi_perform(hInternet->handle, &still_running);
     if(mc==CURLM_OK){
+#if LIBCURL_VERSION_MINOR >= 28
       mc = curl_multi_wait(hInternet->handle, NULL, 0, 1000, &numfds);
+#else
+      struct timeval timeout;
+      fd_set fdread;
+      fd_set fdwrite;
+      fd_set fdexcep;
+      int maxfd = -1;
+
+      long curl_timeo = -1;
+
+      FD_ZERO(&fdread);
+      FD_ZERO(&fdwrite);
+      FD_ZERO(&fdexcep);
+
+      /* set a suitable timeout to play around with */
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
+
+      curl_multi_timeout(hInternet->handle, &curl_timeo);
+      if(curl_timeo >= 0) {
+        timeout.tv_sec = curl_timeo / 1000;
+        if(timeout.tv_sec > 1)
+          timeout.tv_sec = 1;
+        else
+          timeout.tv_usec = (curl_timeo % 1000) * 1000;
+      }
+
+      /* get file descriptors from the transfers */
+      mc = curl_multi_fdset(hInternet->handle, &fdread, &fdwrite, &fdexcep, &maxfd);
+#endif
     }
     if(mc != CURLM_OK) {

branches/prototype-v0/zoo-project/zoo-kernel/ulinet.h

@@ -30 +30 @@
 #include <fcntl.h>
 #include <curl/curl.h>
+#include <curl/curlver.h>
 #include "service.h"
 #ifndef WIN32