Ticket #2282: zoo-patch-test3.patch

thirds/otb2zcfg/otb2zcfg.cxx

@@ -221 +221 @@
           
           if(type == ParameterType_StringList || type == ParameterType_String || type == ParameterType_Float
              || type == ParameterType_Int || type == ParameterType_Choice || type == ParameterType_ListView
-             || type == ParameterType_RAM || type == ParameterType_Empty || type == ParameterType_Directory){
+             || type == ParameterType_RAM /*|| type == ParameterType_Empty*/ || type == ParameterType_Directory){
             std::cout << "   <LiteralData>" << std::endl;
             std::string lt;
             if(type == ParameterType_Int || type == ParameterType_RAM)
@@ -232 +232 @@
                || type == ParameterType_Choice || type == ParameterType_Directory
                || type == ParameterType_ListView)
               lt="string";
-            if(type == ParameterType_Empty)
-              lt="boolean";
+            /*if(type == ParameterType_Empty)
+              lt="boolean";*/
             std::cout << "    dataType = " << lt << std::endl;
             if(type == ParameterType_Choice || type == ParameterType_ListView){
               const std::vector<std::string> nList = m_Application->GetChoiceNames(paramKey);
@@ -280 +280 @@
               printOutputImage(m_Application->GetParameterOutputImagePixelType(paramKey));
             }
             else{
-              if(type == ParameterType_ComplexOutputImage){
+              /*if(type == ParameterType_ComplexOutputImage){
                 printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey));
-              }else{
+              }else*/{
                 std::cout << "   <ComplexData>" << std::endl;
-                if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){
+                if(type == ParameterType_InputImage || type == ParameterType_InputImageList){
                   printImages();
                 }
                 else
@@ -337 +337 @@
         
         if(paramKey!="inxml" && paramKey!="outxml" &&
            ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage
-             || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage
+             || type == ParameterType_OutputImage //|| type == ParameterType_ComplexOutputImage
              || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){
           hasOutput=1;
           std::vector<std::string> values;
@@ -355 +355 @@
             std::cout << "   Abstract = " << paramKey << std::endl;
           }
 
-          if(type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage){
+          if(type == ParameterType_OutputImage){// || type == ParameterType_ComplexOutputImage){
             std::cout << "   <ComplexData>" << std::endl;
             printImages();
             std::cout << "   </ComplexData>" << std::endl;

zoo-project/zoo-kernel/configure.ac

@@ -414 +414 @@
 # Check headers file
 CPPFLAGS_SAVE="$CPPFLAGS"
 CPPFLAGS="$PROJ_CPPFLAGS"
-AC_CHECK_HEADERS([proj_api.h],
-                 [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
+#AC_CHECK_HEADERS([proj_api.h],
+#                 [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
 
 AC_SUBST([PROJ_CPPFLAGS])
 AC_SUBST([PROJ_LDFLAGS])
@@ -618 +618 @@
         # 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/'`
+        PY_LIB=`$PYTHONCONFIG --libs`
         AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
         LIBS="$LIBS_SAVE"
 fi

zoo-project/zoo-kernel/service_internal_otb.c

@@ -361 +361 @@
                   }
                   else
                     if(type == ParameterType_InputImage
-                       || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
+                       || type == ParameterType_InputVectorData
                        || type == ParameterType_InputFilename){
                       m_Application->SetParameterString(paramKey, test->value);
                   }

zoo-project/zoo-kernel/ulinet.h

@@ -33 +33 @@
 #endif
 #include "jsapi.h"
 #endif
-#include "fcgi_stdio.h"
+//#include "fcgi_stdio.h"
 #include <stdlib.h>
 #include <fcntl.h>
 #include <curl/curl.h>

zoo-project/zoo-services/ogr/base-vect-ops/service.c

@@ -37 +37 @@
 #include "service.h"
 #include "service_internal.h"
 
-extern "C" {
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-/*#include <openssl/sha.h>
-#include <openssl/hmac.h>
-#include <openssl/evp.h>
-#include <openssl/bio.h>
-#include <openssl/buffer.h>
-*/
+extern "C" {
 
+
   void printExceptionReportResponse(maps*,map*);
   char *base64(const char *input, int length);