Changeset 955 for trunk/zoo-project/zoo-kernel/service_internal_hpc.c

Timestamp:

Sep 20, 2019, 5:14:48 PM (5 years ago)

Author:

djay

Message:

Fix issue when RELY_ON_DB is on and data is published. Ensure to use WPS 3 only when required. Set wmfs_link, wfs_link or wcs_link only when found in the metadata.

File:

• trunk/zoo-project/zoo-kernel/service_internal_hpc.c (modified) (2 diffs)

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

@@ -1056 +1056 @@
                 maps* tmp=getMaps(*real_outputs,input->name);
                 char serviceName[9];
-                freeMap(&tmp->content);
-                free(tmp->content);
-                tmp->content=NULL;
                 maps* output=getMaps(*real_outputs,input->name);
                 setMapInMaps(output->child,"download_link","generated_file",targetPath);
@@ -1067 +1064 @@
                 setMapInMaps(output->child,"download_link","asReference","true");
                 setMapInMaps(output->child,"download_link","inRequest","true");
-                setMapInMaps(output->child,"wms_link","generated_file",targetPath);
-                setMapInMaps(output->child,"wms_link","storage",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,"wms_link","asReference","true");
-                if(getMaps(output->child,"wcs_link")!=NULL){
-                  sprintf(serviceName,"wcs_link");
-                  setMapInMaps(output->child,"wcs_link","msOgc","WCS");
-                }else{
-                  sprintf(serviceName,"wfs_link");
-                  setMapInMaps(output->child,"wfs_link","msOgc","WFS");
-                }
-                setMapInMaps(output->child,serviceName,"storage",targetPath);
-                setMapInMaps(output->child,serviceName,"generated_file",targetPath);
-                setMapInMaps(output->child,serviceName,"useMapserver","true");
-                setMapInMaps(output->child,serviceName,"asReference","true");
+                if(getMaps(output->child,"wms_link")!=NULL){
+                  setMapInMaps(output->child,"wms_link","generated_file",targetPath);
+                  setMapInMaps(output->child,"wms_link","storage",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,"wms_link","asReference","true");
+                  if(getMaps(output->child,"wcs_link")!=NULL){
+                    sprintf(serviceName,"wcs_link");
+                    setMapInMaps(output->child,"wcs_link","msOgc","WCS");
+                  }else{
+                    sprintf(serviceName,"wfs_link");
+                    setMapInMaps(output->child,"wfs_link","msOgc","WFS");
+                  }
+                  setMapInMaps(output->child,serviceName,"storage",targetPath);
+                  setMapInMaps(output->child,serviceName,"generated_file",targetPath);
+                  setMapInMaps(output->child,serviceName,"useMapserver","true");
+                  setMapInMaps(output->child,serviceName,"asReference","true");
+                }
+                freeMap(&tmp->content);
+                free(tmp->content);
+                tmp->content=NULL;
               }else{
                 map* hpcStdErr=getMapFromMaps(*main_conf,"henv","StdErr");