Changeset 851 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

Timestamp:

Aug 31, 2017, 4:14:46 PM (7 years ago)

Author:

djay

Message:

Invoke callback asynchronously. Still the ZOO-Kernel has still to wait for every requests to finish before stoping its execution.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c (modified) (5 diffs)

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

@@ -137 +137 @@
           }
         }
-        
         addToElements(&cur->child,tmp[0]);
         addToElements(&cur->child,tmp[1]);
@@ -301 +300 @@
       char *targetPath=(char*)malloc((strlen(targetPathMap->value)+strlen(targetName)+2)*sizeof(char));
       sprintf(targetPath,"%s/%s",targetPathMap->value,targetName);
+      free(targetName);
       setMapInMaps(*real_outputs,input->name,"generated_file",targetPath);
       // We should verify if any optional tag for output is required
@@ -337 +337 @@
       char *targetPath=(char*)malloc((strlen(targetPathMap->value)+strlen(targetName)+2)*sizeof(char));
       sprintf(targetPath,"%s/%s",targetPathMap->value,targetName);
+      free(targetName);
       addToMap(input->content,"generated_file",targetPath);
       // We should verify if any optional tag for output is required
@@ -499 +500 @@
     return -1;
   }
+  free(targetPath);
   fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
   fflush(stderr);
@@ -591 +593 @@
                 setMapInMaps(output->child,"download_link","generated_file",targetPath);
                 setMapInMaps(output->child,"download_link","useMapserver","false");
-                setMapInMaps(output->child,"WMS_LINK","generated_file",targetPath);
-                setMapInMaps(output->child,"WMS_LINK","useMapserver","true");
-                setMapInMaps(output->child,"WCS_LINK","generated_file",targetPath);
-                setMapInMaps(output->child,"WCS_LINK","useMapserver","true");
+                setMapInMaps(output->child,"wms_link","generated_file",targetPath);
+                setMapInMaps(output->child,"wms_link","useMapserver","true");
+                setMapInMaps(output->child,"wms_link","msOgc","WMS");
+                setMapInMaps(output->child,"wms_link","requestedMimeType","image/png");
+                setMapInMaps(output->child,"wcs_link","generated_file",targetPath);
+                setMapInMaps(output->child,"wcs_link","useMapserver","true");
               }
+              free(targetPath);
             }
           }
           input=input->next;
         }
-        fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-        fflush(stderr);
-        invokeCallback(m,NULL,outputs,5,1);
-        fprintf(stderr,"************************* %s %d \n\n",__FILE__,__LINE__);
-        fflush(stderr);
       }
       //free(buf);