Changeset 984 for trunk/zoo-project/zoo-kernel

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.

Location:

trunk/zoo-project/zoo-kernel

Files:

• configure.ac (modified) (3 diffs)
• main_conf_read.y (modified) (1 diff)
• service.c (modified) (1 diff)
• service_internal_ms.c (modified) (1 diff)
• service_internal_otb.c (modified) (5 diffs)
• service_internal_otb.h (modified) (1 diff)
• ulinet.h (modified) (1 diff)
• zoo_service_loader.c (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -415 +415 @@
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$PROJ_CPPFLAGS"
-AC_CHECK_HEADERS([proj_api.h],
-                 [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
 
 AC_SUBST([PROJ_CPPFLAGS])
@@ -607 +605 @@
         echo $PYTHONCONFIG
         # Extract the linker and include flags 
-        PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
+        #PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
+        PYTHON_LDFLAGS=$($PYTHONCONFIG --ldflags | sed "s:python${PYTHON_VERS}/config-${PYTHON_VERS}-::g")
         PYTHON_CPPFLAGS=`$PYTHONCONFIG --includes`
 
@@ -618 +617 @@
         # Ensure we can link against libphp
         LIBS_SAVE="$LIBS"
-        LIBS="$PYTHON_LDFLAGS"
-        PY_LIB=`$PYTHONCONFIG --libs | sed \
-                              -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
-        AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        #LIBS="$PYTHON_LDFLAGS"
+        #PY_LIB=`$PYTHONCONFIG --libs | sed \
+        #                     -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
+        #AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        LIBS="m $PYTHON_LDFLAGS -lpython${PYTHON_VERS}"
+        PYTHON_LDFLAGS="-l$LIBS"
+        LDFLAGS=$PYTHON_LDFLAGS
+        AC_CHECK_LIB([], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
         LIBS="$LIBS_SAVE"
 fi

trunk/zoo-project/zoo-kernel/main_conf_read.y

@@ -154 +154 @@
   my_maps=my_map;
   my_maps->name=NULL;
+  my_maps->content=NULL;
+  my_maps->child=NULL;
+  my_maps->next=NULL;
   current_maps=my_maps;
   

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

@@ -838 +838 @@
         else
           pmsCursor->next->child=NULL;
+        return;
       }
       else{

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

@@ -1272 +1272 @@
   m->numlayers++;
   GDALClose( hDataset );
+#ifndef RELY_ON_DB
   GDALDestroyDriverManager();
+#endif
   CPLCleanupTLS();
   storeMd5(pszFilename);

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

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

@@ -36 +36 @@
 #include "service_internal.h"
 #include "service.h"
-#include "cgic.h"
 #ifdef WIN32
 #include <windows.h>
 #include <direct.h>
 #endif
-#include <vector>
-#include <string>
 
 /**

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

@@ -34 +34 @@
 #include "jsapi.h"
 #endif
-#include "fcgi_stdio.h"
 #include <stdlib.h>
 #include <fcntl.h>

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

@@ -1886 +1886 @@
   FILE *f0, *f1;
   HINTERNET hInternet;
-  service *s1;
+  service *s1=NULL;
   maps *request_output_real_format = NULL;
   maps *request_input_real_format = NULL;
@@ -2552 +2552 @@
       printf("\n");
       fflush(stdout);
+      json_object_put(res);
     }
     //return 1;
@@ -3453 +3454 @@
 #else
       recordResponse(m,fbkp1);
+#ifdef USE_CALLBACK
       if (eres == SERVICE_SUCCEEDED)
-#ifdef USE_CALLBACK
         invokeCallback(m,NULL,request_output_real_format,6,0);
 #endif
@@ -3493 +3494 @@
 #endif
   }
-  
-  freeService (&s1);
-  free (s1);
+
+  if(s1!=NULL){
+    freeService (&s1);
+    free (s1);
+  }
   freeMaps (&m);
   free (m);