Changeset 807

Timestamp:

Jan 22, 2017, 5:56:53 PM (8 years ago)

Author:

djay

Message:

Merge trunk into branch-1.6

Location:

branches/branch-1.6

Files:

• . (modified) (1 prop)
• docs/contribute/release.rst (modified) (1 diff)
• docs/install/installation.rst (modified) (1 diff)
• zoo-project/zoo-kernel/configure.ac (modified) (2 diffs)
• zoo-project/zoo-kernel/request_parser.c (modified) (1 diff)
• zoo-project/zoo-kernel/server_internal.c (modified) (1 diff)
• zoo-project/zoo-kernel/service.c (modified) (2 diffs)

branches/branch-1.6/docs/contribute/release.rst

@@ -22 +22 @@
 * Read the documentation and remove outdated parts.
 * Create release candidate as .zip and .tar.bz2  then add them on this
-  `page <http://zoo-project.org/site/Downloads>`_ (by editing this
-  `wiki page <http://zoo-project.org/trac/wiki/Download>`_)
+  `page <http://zoo-project.org/new/Code/Download>`_ (by editing this
+  `wiki page <http://zoo-project.org/trac/wiki/ZooWebSite/2015/Code/Download>`_)
 * Cut a release candidate once you think that everything is in
   order. Announce the release candidate for review for at least 1

branches/branch-1.6/docs/install/installation.rst

@@ -94 +94 @@
 installation directory but, in case you want to store this file in
 another place, then you can use the ``--with-etc-dir`` option so it
-will search for the ``main.cfg``file in the ``sysconfdir`` directory.
+will search for the ``main.cfg`` file in the ``sysconfdir`` directory.
 
 For instance, you can define that the directory to store the

branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

@@ -814 +814 @@
         fi
         OTB_ENABLED="-DUSE_OTB"
+        IVERS="$(echo -e '4.10\n$ITKVERS' | sort -r | head -n1)"
+        if test "$IVERS" == "$ITKVERS"; then
+           ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS"
+        else
+                ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS"
+        fi
+
         if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then 
                 OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
                 OTB_CPPFLAGS="-I${OTB_RPATH}ApplicationEngine -I$OTB_RPATH/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTB_RPATH/Utilities/ITK -I$OTB_RPATH/ -I$OTB_RPATH/IO -I$OTB_RPATH/UtilitiesAdapters/OssimAdapters -I$OTB_RPATH/UtilitiesAdapters/CurlAdapters -I$OTB_RPATH/Utilities/BGL -I$OTB_RPATH/UtilitiesAdapters/ITKPendingPatches -I$OTB_RPATH/Utilities/otbconfigfile $GDAL_CFLAGS"
-                OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS "
+                OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib $ITK_LDFLAGS"
         else
                 OTB_CPPFLAGS="-I$OTBPATH/include/otb/ApplicationEngine -I$OTBPATH/include/otb/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTBPATH/include/otb/Utilities/ITK -I$OTBPATH/include/otb/ -I$OTBPATH/include/otb/IO -I$OTBPATH/include/otb/UtilitiesAdapters/OssimAdapters -I$OTBPATH/include/otb/UtilitiesAdapters/CurlAdapters -I$OTBPATH/include/otb/Utilities/BGL -I$OTBPATH/include/otb/UtilitiesAdapters/ITKPendingPatches -I$OTBPATH/include/otb/Utilities/otbconfigfile $GDAL_CFLAGS"
-                OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib -lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkdouble-conversion-$ITKVERS -litkv3p_lsqr-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS -litkzlib-$ITKVERS"
+                OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib $ITK_LDFLAGS"
 
         fi
@@ -831 +838 @@
         LDFLAGS_SAVE="$LDFLAGS"
         LIBS="$LIBS_SAVE $OTB_LDFLAGS"
-        echo $OTB_CPPFLAGS
-        #AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
-        #               [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
+        #echo $OTB_CPPFLAGS
+        AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
+                        [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
         LDFLAGS_SAVE="$LDFLAGS"
         LDFLAGS="$OTB_LDFLAGS"
-        echo $OTB_LDFLAGS
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"],[std::vector<std::string> list = otb::Wrapwper::ApplicationRegistry::GetAvailableApplication();]])],
-                [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
+        #echo $OTB_LDFLAGS
+        #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
+        #if test "$OTBVERS" ==  "$UVERS" ; then 
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
+                        [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
+        #else
+        #       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
+        #                                                  [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
+        #fi
+                                                                                
         LDFLAGS="$LDFLAGS_SAVE"
         AC_LANG_POP([C++])

branches/branch-1.6/zoo-project/zoo-kernel/request_parser.c

@@ -861 +861 @@
                       while(cur4 != NULL && 
                             cur4->type != XML_CDATA_SECTION_NODE &&
-                            cur4->type != XML_TEXT_NODE)
+                            cur4->type != XML_TEXT_NODE &&
+                            cur4->type != XML_ELEMENT_NODE)
                         cur4=cur4->next;
                       if(cur4!=NULL){
-                        if(cur4->content!=NULL){
+                        if (cur4->type == XML_ELEMENT_NODE)
+                          {
+                            xmlChar *mv;
+                            int buffersize;
+                            xmlDocPtr doc1 = xmlNewDoc (BAD_CAST "1.0");
+                            xmlDocSetRootElement (doc1, cur4);
+                            xmlDocDumpFormatMemoryEnc (doc1, &mv,
+                                                       &buffersize,
+                                                       "utf-8", 0);
+                            if (tmpmaps->content != NULL)
+                              addToMap (tmpmaps->content, "value",
+                                        (char *) mv);
+                            else
+                              tmpmaps->content =
+                                createMap ("value", (char *) mv);
+                            free(mv);
+                          }
+                        else{
                           if (tmpmaps->content != NULL)
                             addToMap (tmpmaps->content, "value",

branches/branch-1.6/zoo-project/zoo-kernel/server_internal.c

@@ -791 +791 @@
          * check for useMapServer presence
          */
-        map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
-        if(tmpCheck!=NULL){
-          // Get the default value
-          tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
-          tmpCheck=getMap(tmpMaps->content,"mimeType");
-          addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
-          map* cursor=tmpIoType->content;
-          while(cursor!=NULL){
-            addToMap(tmpMaps->content,cursor->name,cursor->value);
-            cursor=cursor->next;
-          }
+        if(tmpIoType!=NULL){
+          map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
+          if(tmpCheck!=NULL){
+            // Get the default value
+            tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
+            tmpCheck=getMap(tmpMaps->content,"mimeType");
+            addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
+            map* cursor=tmpIoType->content;
+            while(cursor!=NULL){
+              addToMap(tmpMaps->content,cursor->name,cursor->value);
+              cursor=cursor->next;
+            }
           
-          cursor=tmpInputs->content;
-          while(cursor!=NULL){
-            if(strcasecmp(cursor->name,"Title")==0 ||
-               strcasecmp(cursor->name,"Abstract")==0)
-              addToMap(tmpMaps->content,cursor->name,cursor->value);
-           cursor=cursor->next;
+            cursor=tmpInputs->content;
+            while(cursor!=NULL){
+              if(strcasecmp(cursor->name,"Title")==0 ||
+                 strcasecmp(cursor->name,"Abstract")==0)
+                addToMap(tmpMaps->content,cursor->name,cursor->value);
+              cursor=cursor->next;
+            }
           }
         }

branches/branch-1.6/zoo-project/zoo-kernel/service.c

@@ -635 +635 @@
 iotype* getIoTypeFromElement(elements* e,char *name, map* values){
   elements* cursor=e;
-  if(values!=NULL)
+  if(values!=NULL){
     while(cursor!=NULL){
       if(strcasecmp(cursor->name,name)==0 && (cursor->defaults!=NULL || cursor->supported!=NULL)){
@@ -651 +651 @@
       cursor=cursor->next;
     }
+  }else{
+    while(cursor!=NULL){
+      if(strcasecmp(cursor->name,name)==0 && cursor->defaults!=NULL){
+        return cursor->defaults;
+      }
+      cursor=cursor->next;
+    }
+  }
   return NULL;
 }