Changeset 888 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.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/service_internal_hpc.c (modified) (2 diffs)

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

@@ -320 +320 @@
 
   map* targetPathMap=getMapFromMaps(*main_conf,configurationId,"remote_data_path");
+  map* targetPersistentPathMap=getMapFromMaps(*main_conf,configurationId,"remote_persistent_data_path");
   
   pthread_t threads_pool[50];
@@ -362 +363 @@
           for(i=0;i<len;i++){
             map* tmp=getMapArray(input->content,"cache_file",i);
+            map* origin=getMapArray(input->content,"origin",i);
             char* targetName=strrchr(tmp->value,'/');
-            char *targetPath=(char*)malloc((strlen(targetPathMap->value)+strlen(targetName)+2)*sizeof(char));
-            sprintf(targetPath,"%s/%s",targetPathMap->value,targetName);
+            char *targetPath;
+            if(origin!=NULL && strcasecmp(origin->value,"SHARED")==0 && targetPersistentPathMap!=NULL){
+              targetPath=(char*)malloc((strlen(targetPersistentPathMap->value)+strlen(targetName)+2)*sizeof(char));
+              sprintf(targetPath,"%s/%s",targetPersistentPathMap->value,targetName);
+            }
+            else{
+              targetPath=(char*)malloc((strlen(targetPathMap->value)+strlen(targetName)+2)*sizeof(char));
+              sprintf(targetPath,"%s/%s",targetPathMap->value,targetName);
+            }
             setMapArray(input->content,"targetPath",i,targetPath);
             setMapArray(input->content,"localPath",i,tmp->value);