Changeset 565 for trunk/zoo-project


Ignore:
Timestamp:
Feb 9, 2015, 5:37:32 PM (9 years ago)
Author:
djay
Message:

Add support for expected_generated_file in case we can predict that the name of the generated_file will vary from the name given for an output (specific to OTB support).

Location:
trunk/zoo-project/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r564 r565  
    26022602          char *file_name;
    26032603          if(gfile!=NULL){
     2604            gfile=getMap(tmpI->content,"expected_generated_file");
     2605            if(gfile==NULL){
     2606              gfile=getMap(tmpI->content,"generated_file");
     2607            }
    26042608            readGeneratedFile(m,tmpI->content,gfile->value);       
    26052609            file_name=(char*)malloc((strlen(gfile->value)+strlen(tmp1->value)+1)*sizeof(char));
  • trunk/zoo-project/zoo-kernel/service_internal_otb.c

    r564 r565  
    193193                                ext="kml";
    194194                              else
    195                                 if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kmz",32)==0)
     195                                if(strncasecmp(tmpVal->value,"application/vnd.google-earth.kmz",32)==0){
    196196                                  ext="kmz";
     197                                  sprintf(tmp,"%s/%s_%sxt.%s",tmpPath->value,s->name,tmpSid->value,ext);
     198                                  m_Application->SetParameterString(paramKey, tmp);
     199                                  setMapInMaps(outputs,paramKey.c_str(),"expected_generated_file",tmp);
     200                                }
    197201
    198202                      }
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