Changeset 807


Ignore:
Timestamp:
Jan 22, 2017, 5:56:53 PM (3 years ago)
Author:
djay
Message:

Merge trunk into branch-1.6

Location:
branches/branch-1.6
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.6

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

    r800 r807  
    2222* Read the documentation and remove outdated parts.
    2323* Create release candidate as .zip and .tar.bz2  then add them on this
    24   `page <http://zoo-project.org/site/Downloads>`_ (by editing this
    25   `wiki page <http://zoo-project.org/trac/wiki/Download>`_)
     24  `page <http://zoo-project.org/new/Code/Download>`_ (by editing this
     25  `wiki page <http://zoo-project.org/trac/wiki/ZooWebSite/2015/Code/Download>`_)
    2626* Cut a release candidate once you think that everything is in
    2727  order. Announce the release candidate for review for at least 1
  • branches/branch-1.6/docs/install/installation.rst

    r784 r807  
    9494installation directory but, in case you want to store this file in
    9595another place, then you can use the ``--with-etc-dir`` option so it
    96 will search for the ``main.cfg``file in the ``sysconfdir`` directory.
     96will search for the ``main.cfg`` file in the ``sysconfdir`` directory.
    9797
    9898For instance, you can define that the directory to store the
  • branches/branch-1.6/zoo-project/zoo-kernel/configure.ac

    r800 r807  
    814814        fi
    815815        OTB_ENABLED="-DUSE_OTB"
     816        IVERS="$(echo -e '4.10\n$ITKVERS' | sort -r | head -n1)"
     817        if test "$IVERS" == "$ITKVERS"; then
     818           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"
     819        else
     820                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"
     821        fi
     822
    816823        if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then
    817824                OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
    818825                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"
    819                 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 "
     826                OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib $ITK_LDFLAGS"
    820827        else
    821828                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"
    822                 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"
     829                OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib $ITK_LDFLAGS"
    823830
    824831        fi
     
    831838        LDFLAGS_SAVE="$LDFLAGS"
    832839        LIBS="$LIBS_SAVE $OTB_LDFLAGS"
    833         echo $OTB_CPPFLAGS
    834         #AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
    835         #               [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
     840        #echo $OTB_CPPFLAGS
     841        AC_CHECK_HEADERS([otbWrapperApplication.h otbWrapperInputImageListParameter.h otbWrapperApplicationRegistry.h],
     842                        [], [AC_MSG_ERROR([could not find header file $i related to OTB])])
    836843        LDFLAGS_SAVE="$LDFLAGS"
    837844        LDFLAGS="$OTB_LDFLAGS"
    838         echo $OTB_LDFLAGS
    839         AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"],[std::vector<std::string> list = otb::Wrapwper::ApplicationRegistry::GetAvailableApplication();]])],
    840                 [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
     845        #echo $OTB_LDFLAGS
     846        #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
     847        #if test "$OTBVERS" ==  "$UVERS" ; then
     848        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
     849                        [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
     850        #else
     851        #       AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
     852        #                                                  [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
     853        #fi
     854                                                                               
    841855        LDFLAGS="$LDFLAGS_SAVE"
    842856        AC_LANG_POP([C++])
  • branches/branch-1.6/zoo-project/zoo-kernel/request_parser.c

    r797 r807  
    861861                      while(cur4 != NULL &&
    862862                            cur4->type != XML_CDATA_SECTION_NODE &&
    863                             cur4->type != XML_TEXT_NODE)
     863                            cur4->type != XML_TEXT_NODE &&
     864                            cur4->type != XML_ELEMENT_NODE)
    864865                        cur4=cur4->next;
    865866                      if(cur4!=NULL){
    866                         if(cur4->content!=NULL){
     867                        if (cur4->type == XML_ELEMENT_NODE)
     868                          {
     869                            xmlChar *mv;
     870                            int buffersize;
     871                            xmlDocPtr doc1 = xmlNewDoc (BAD_CAST "1.0");
     872                            xmlDocSetRootElement (doc1, cur4);
     873                            xmlDocDumpFormatMemoryEnc (doc1, &mv,
     874                                                       &buffersize,
     875                                                       "utf-8", 0);
     876                            if (tmpmaps->content != NULL)
     877                              addToMap (tmpmaps->content, "value",
     878                                        (char *) mv);
     879                            else
     880                              tmpmaps->content =
     881                                createMap ("value", (char *) mv);
     882                            free(mv);
     883                          }
     884                        else{
    867885                          if (tmpmaps->content != NULL)
    868886                            addToMap (tmpmaps->content, "value",
  • branches/branch-1.6/zoo-project/zoo-kernel/server_internal.c

    r798 r807  
    791791         * check for useMapServer presence
    792792         */
    793         map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
    794         if(tmpCheck!=NULL){
    795           // Get the default value
    796           tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
    797           tmpCheck=getMap(tmpMaps->content,"mimeType");
    798           addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
    799           map* cursor=tmpIoType->content;
    800           while(cursor!=NULL){
    801             addToMap(tmpMaps->content,cursor->name,cursor->value);
    802             cursor=cursor->next;
    803           }
     793        if(tmpIoType!=NULL){
     794          map* tmpCheck=getMap(tmpIoType->content,"useMapServer");
     795          if(tmpCheck!=NULL){
     796            // Get the default value
     797            tmpIoType=getIoTypeFromElement(tmpInputs,tmpInputs->name,NULL);
     798            tmpCheck=getMap(tmpMaps->content,"mimeType");
     799            addToMap(tmpMaps->content,"requestedMimeType",tmpCheck->value);
     800            map* cursor=tmpIoType->content;
     801            while(cursor!=NULL){
     802              addToMap(tmpMaps->content,cursor->name,cursor->value);
     803              cursor=cursor->next;
     804            }
    804805         
    805           cursor=tmpInputs->content;
    806           while(cursor!=NULL){
    807             if(strcasecmp(cursor->name,"Title")==0 ||
    808                strcasecmp(cursor->name,"Abstract")==0)
    809               addToMap(tmpMaps->content,cursor->name,cursor->value);
    810            cursor=cursor->next;
     806            cursor=tmpInputs->content;
     807            while(cursor!=NULL){
     808              if(strcasecmp(cursor->name,"Title")==0 ||
     809                 strcasecmp(cursor->name,"Abstract")==0)
     810                addToMap(tmpMaps->content,cursor->name,cursor->value);
     811              cursor=cursor->next;
     812            }
    811813          }
    812814        }
  • branches/branch-1.6/zoo-project/zoo-kernel/service.c

    r794 r807  
    635635iotype* getIoTypeFromElement(elements* e,char *name, map* values){
    636636  elements* cursor=e;
    637   if(values!=NULL)
     637  if(values!=NULL){
    638638    while(cursor!=NULL){
    639639      if(strcasecmp(cursor->name,name)==0 && (cursor->defaults!=NULL || cursor->supported!=NULL)){
     
    651651      cursor=cursor->next;
    652652    }
     653  }else{
     654    while(cursor!=NULL){
     655      if(strcasecmp(cursor->name,name)==0 && cursor->defaults!=NULL){
     656        return cursor->defaults;
     657      }
     658      cursor=cursor->next;
     659    }
     660  }
    653661  return NULL;
    654662}
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png