Changeset 961 for trunk/zoo-project/zoo-kernel/caching.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/caching.c (modified) (2 diffs)

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

@@ -403 +403 @@
   if(strncasecmp(request,"file://",7)==0){
     char* tmpStr=zStrdup(request+7);
-    fprintf(stderr,"**** %s %d %s \n",__FILE__,__LINE__,tmpStr);
+    setMapInMaps(conf,"lenv",tmpStr,"local");
     return tmpStr;
   }
@@ -709 +709 @@
       unlockFile(*m,lck);
     }
-    cached[strlen(cached)-1]='m';
-    s=zStat(cached, &f_status);
-    if(s==0){
-      zooLock* lck=lockFile(*m,cached,'r');
-      if(lck==NULL)
-        return -1;
-      mimeType=(char*)malloc(sizeof(char)*(f_status.st_size+1));
-      FILE* f=fopen(cached,"rb");
-      fread(mimeType,f_status.st_size,1,f);
-      mimeType[f_status.st_size]=0;
-      fclose(f);
-      unlockFile(*m,lck);
-    }
-    cached[strlen(cached)-1]='p';
-    s=zStat(cached, &f_status);
-    if(s==0){
-      zooLock* lck=lockFile(*m,cached,'r');
-      if(lck==NULL)
-        return -1;
-      origin=(char*)malloc(sizeof(char)*(f_status.st_size+1));
-      FILE* f=fopen(cached,"rb");
-      fread(origin,f_status.st_size,1,f);
-      mimeType[f_status.st_size]=0;
-      fclose(f);
-      unlockFile(*m,lck);
-    }
+    map* isLocalFile=getMapFromMaps(*m,"lenv",cached);
+    if(isLocalFile==NULL){
+      cached[strlen(cached)-1]='m';
+      s=zStat(cached, &f_status);
+      if(s==0){
+        zooLock* lck=lockFile(*m,cached,'r');
+        if(lck==NULL)
+          return -1;
+        mimeType=(char*)malloc(sizeof(char)*(f_status.st_size+1));
+        FILE* f=fopen(cached,"rb");
+        fread(mimeType,f_status.st_size,1,f);
+        mimeType[f_status.st_size]=0;
+        fclose(f);
+        unlockFile(*m,lck);
+      }
+      cached[strlen(cached)-1]='p';
+      s=zStat(cached, &f_status);
+      if(s==0){
+        zooLock* lck=lockFile(*m,cached,'r');
+        if(lck==NULL)
+          return -1;
+        origin=(char*)malloc(sizeof(char)*(f_status.st_size+1));
+        FILE* f=fopen(cached,"rb");
+        fread(origin,f_status.st_size,1,f);
+        mimeType[f_status.st_size]=0;
+        fclose(f);
+        unlockFile(*m,lck);
+      }
+    }    
   }else{    
     addRequestToQueue(m,hInternet,url,true);