Changeset 888 for branches/prototype-v0/zoo-project/zoo-kernel/caching.c

Timestamp:

Nov 16, 2018, 3:09:05 PM (5 years ago)

Author:

djay

Message:

Add support for output style definition depending on geometry type (msStylePoly, msStylePoint, msStrylLine). Upload shared data in remote_persitent_data_path rather than remote_data_path (used for not shared data). In case output data should be published and the data is empty (nb_pixels or nb_features is set to 0) then, the ZOO-Kernel returns an ExceptionReport? with an Exception for every output.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/caching.c (modified) (7 diffs)

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

@@ -411 +411 @@
     char *mimeType=NULL;
     int fsize=0;
+    char oriname[12];
     char cname[15];
     char vname[11];
@@ -430 +431 @@
       sprintf(cname,"cache_file_%d",i);
       tmp1=getMap(content->content,cname);
+      sprintf(oriname,"origin_%d",i);
       sprintf(vname,"value_%d",i);
       sprintf(sname,"size_%d",i);
@@ -441 +443 @@
     }else{
       sprintf(cname,"cache_file");
+      sprintf(oriname,"origin");
       sprintf(vname,"value");
       sprintf(sname,"size");
@@ -539 +542 @@
         addToMap((*in)->content,sname,ltmp1);
         addToMap((*in)->content,mname,mimeType);
+        char* origin=getProvenance(*m,request);
+        addToMap((*in)->content,oriname,origin);
         if(memUse==NULL || strcasecmp(memUse->value,"load")==0){
           addToCache(*m,request,fcontent,mimeType,fsize, NULL, 0);
@@ -632 +637 @@
   char* cached=isInCache(*m,url);
   char *mimeType=NULL;
+  char *origin=NULL;
   int fsize=0;
   map* memUse=getMapFromMaps(*m,"main","memory");
@@ -674 +680 @@
       unlockFile(*m,lck);
     }
+    cached[strlen(cached)-1]='p';
+    s=stat(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);
@@ -683 +702 @@
   if(mimeType!=NULL){
     addToMap(*content,"fmimeType",mimeType);
+  }
+  if(origin!=NULL){
+    addToMap(*content,"origin",origin);
   }