Changeset 955 for trunk

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.

Location:

trunk/zoo-project/zoo-kernel

Files:

• caching.c (modified) (1 diff)
• response_print.c (modified) (2 diffs)
• service.c (modified) (1 diff)
• service_callback.c (modified) (2 diffs)
• service_callback.h (modified) (1 diff)
• service_internal_hpc.c (modified) (2 diffs)
• service_internal_ms.c (modified) (1 diff)
• sqlapi.c (modified) (1 diff)
• ulinet.c (modified) (2 diffs)
• zoo_service_loader.c (modified) (2 diffs)

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

@@ -25 +25 @@
 #include <openssl/md5.h>
 #include <openssl/evp.h>
-#include "caching.h"
 #include "service.h"
 #include "service_internal.h"
 #include "response_print.h"
+#include "caching.h"
 #ifdef MS_FORCE_LOCAL_FILE_USE
 #include "ogr_api.h"

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

@@ -23 +23 @@
  */
 
+#include "response_print.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"
@@ -34 +35 @@
 #include "service_internal.h"
 #include "server_internal.h"
-#include "response_print.h"
 
 #ifndef WIN32

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

@@ -130 +130 @@
     fflush(file);
     tmp=tmp->next;
+    cnt++;
     if(limit>=0 && cnt==limit)
       tmp=NULL;
-    cnt++;
   }
   fflush(file);

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

@@ -27 +27 @@
  */
 
-#include "service_callback.h"
 #include "service_json.h"
 #include "service_internal_ms.h"
@@ -41 +40 @@
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
+
+#include "service_callback.h"
 
 #ifdef __cplusplus

trunk/zoo-project/zoo-kernel/service_callback.h

@@ -32 +32 @@
 #pragma once
 
+#include <ulinet.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <service.h>
-#include <ulinet.h>
 
 #ifdef __cplusplus

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");

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

@@ -1528 +1528 @@
   msFreeMap(myMap);
   //msFree(myMap);
-  msGDALCleanup();
+  //msGDALCleanup();
 }
 

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

@@ -31 +31 @@
 #endif
 
+#include <fcgi_stdio.h>
 #include "sqlapi.h"
-#include <fcgi_stdio.h>
-#include <stdlib.h>
 
 /**

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

@@ -269 +269 @@
  */
 char* getProvenance(maps* conf,const char* url){
+  int i=0;
   map* sharedCache=getMapFromMaps(conf,"security","shared");
   char *res="OTHER";
@@ -285 +286 @@
     }
   }
-  for(int i=0;i<2;i++){
+  for(i=0;i<2;i++){
     sharedCache=getMapFromMaps(conf,"main",paths[i]);
     if(sharedCache!=NULL){

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

@@ -69 +69 @@
 #include "response_print.h"
 #include "request_parser.h"
-#include "sqlapi.h"
 #ifdef USE_JSON
 #include "caching.h"
 #endif
+#include "sqlapi.h"
 
 #ifdef META_DB
@@ -1872 +1872 @@
   
   setMapInMaps(m,"lenv","executionType","xml");
-  if((strlen(cgiQueryString)>0 && cgiQueryString[0]=='/') || strstr(cgiAccept,"json")!=NULL){
+  if((strlen(cgiQueryString)>0 && cgiQueryString[0]=='/') && strstr(cgiAccept,"json")!=NULL){
   //
   // OGC API - Processing starts here