Changeset 984 for trunk/zoo-project/zoo-kernel/service_internal_otb.c

Timestamp:

Mar 3, 2021, 3:41:55 PM (3 years ago)

Author:

djay

Message:

Take into account building ZOO-Project on ubuntu focal (cf. ​https://trac.osgeo.org/osgeolive/ticket/2282). Add the OTB and SAGA support to the Dockerfile to make the corresponding demos using docker WPS server. Add OGC API - Processes demo to the demos list.

File:

• trunk/zoo-project/zoo-kernel/service_internal_otb.c (modified) (5 diffs)

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

@@ -211 +211 @@
                 }else{
                   if(type == ParameterType_OutputVectorData){
-                      char* ext="json";
+                      const char* ext="json";
                       if(tmpVal!=NULL){
                         if(strncasecmp(tmpVal->value,"text/xml",8)==0)
@@ -232 +232 @@
                   else
                     if(type == ParameterType_OutputFilename){
-                      char* ext="txt";
+                      const char* ext="txt";
                       if(tmpVal!=NULL){
                         if(strncasecmp(tmpVal->value,"text/xml",8)==0)
@@ -308 +308 @@
                     char tmp[1024];
                     map* tmpVal=getMapFromMaps(inputs,paramKey.c_str(),"mimeType");
-                    char* ext="json";
+                    const char* ext="json";
                     if(tmpVal!=NULL){
                       if(strncasecmp(tmpVal->value,"application/zip",14)==0){
@@ -362 +362 @@
                   else
                     if(type == ParameterType_InputImage
-                       || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
+                       || type == ParameterType_InputVectorData
                        || type == ParameterType_InputFilename){
                       m_Application->SetParameterString(paramKey, test->value);
@@ -403 +403 @@
                         long count;
                         
-                        char *exts[4];
+                        const char *exts[4];
                         exts[0]=".shp";
                         exts[1]=".shx";