Changeset 961 for trunk/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Sep 8, 2020, 4:51:09 PM (4 years ago)

Author:

djay

Message:

Make sure not to try accessing mimetype and provenance in case a local file is used. Fix issue with addMapsToMaps. Produce value string only when memory=load for Python support. Make gdal/profile service usable in case memory=protect.

File:

• trunk/zoo-project/zoo-kernel/server_internal.c (modified) (3 diffs)

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

@@ -373 +373 @@
     return ;
   }
-  fseek(file, 0, SEEK_END);
   zStatStruct f_status;
   int s=zStat(filename, &f_status);
   sprintf(rsize,"%lld",f_status.st_size);
-  rewind(file);
   if(getMap(content,"storage")==NULL){
     map* memUse=getMapFromMaps(m,"main","memory");
@@ -390 +388 @@
       if(tmpMap1->value==NULL){
         setMapInMaps(m,"lenv","message","Unable to allocate the memory required to read the produced file.");
+        return;
       }
       fread(&tmpMap1->value,1,f_status.st_size,file);
@@ -395 +394 @@
     }
   }
-  fclose(file);  
-  addToMap(content,"size",rsize);
+  fclose(file);
+  if(content!=NULL)
+    addToMap(content,"size",rsize);
 }