Changeset 797 for trunk/zoo-project/zoo-kernel/caching.c

Timestamp:

Jan 10, 2017, 5:21:45 PM (7 years ago)

Author:

djay

Message:

Return an ExceptionReport? in case any inpts failed to be downloaded.

File:

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

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

@@ -154 +154 @@
  * @param index the input index
  * @param hInternet the internet connection
- * @return 0 in case of success, 4 in case of failure
- */
-int readCurrentInput(maps** m,maps** in,int* index,HINTERNET* hInternet){
+ * @param error the error map pointer
+ * @return 0 in case of success, -1 in case of failure
+ */
+int readCurrentInput(maps** m,maps** in,int* index,HINTERNET* hInternet,map** error){
   map* tmp1;
   char sindex[5];
@@ -207 +208 @@
       
       if(getMap(content->content,icname)==NULL){
-        
         fcontent=(char*)malloc((hInternet->ihandle[*index].nDataLen+1)*sizeof(char));
         if(fcontent == NULL){
-          return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL);
+          errorException(*m, _("Unable to allocate memory"), "InternalError",NULL);
+          return -1;
         }
         size_t dwRead;
@@ -231 +232 @@
         }
         memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
+        if(hInternet->ihandle[*index].code!=200){
+          char *error_rep_str=_("Unable to download the file for the input <%s>, response code was : %d.");
+          char *error_msg=(char*)malloc((strlen(error_rep_str)+strlen(content->name)+4)*sizeof(char));
+          sprintf(error_msg,error_rep_str,content->name,hInternet->ihandle[*index].code);
+          if(*error==NULL){
+            *error=createMap("text",error_msg);
+            addToMap(*error,"locator",content->name);
+            addToMap(*error,"code","InvalidParameterValue");
+          }else{
+            int nb=1;
+            map* tmpMap=getMap(*error,"length");
+            if(tmpMap!=NULL)
+              nb=atoi(tmpMap->value);
+            setMapArray(*error,"text",nb,error_msg);
+            setMapArray(*error,"locator",nb,content->name);
+            setMapArray(*error,"code",nb,"InvalidParameterValue");
+          }
+          return -1;
+        }
         
         char ltmp1[256];
@@ -266 +286 @@
  *  per default based on the zcfg file)
  * @param hInternet the HINTERNET pointer
- * @return 0 on success
- */
-int runHttpRequests(maps** m,maps** inputs,HINTERNET* hInternet){
+ * @param error the error map pointer
+ * @return 0 on success, -1 on failure
+ */
+int runHttpRequests(maps** m,maps** inputs,HINTERNET* hInternet,map** error){
+  int hasAFailure=0;
   if(hInternet!=NULL && hInternet->nb>0){
     processDownloads(hInternet);
@@ -277 +299 @@
         maps* cursor=content->child;
         while(cursor!=NULL){
-          readCurrentInput(m,&cursor,&index,hInternet);
+          int red=readCurrentInput(m,&cursor,&index,hInternet,error);
+          if(red<0)
+            hasAFailure=red;
           cursor=cursor->next;
         }
       }
-      else
-        readCurrentInput(m,&content,&index,hInternet);
+      else{
+        int red=readCurrentInput(m,&content,&index,hInternet,error);
+        if(red<0)
+          hasAFailure=red;
+      }
       content=content->next;
-    } 
-  }
-  return 0;
+    }
+  }
+  return hasAFailure;
 }