Ignore:
Timestamp:
Sep 12, 2018, 4:02:49 PM (3 years ago)
Author:
djay
Message:

Modify memory configuration option gesture. Now, in case you don't have setup memory option in the main section your main.cfg file then, the ZOO-Kernel will load everything in memory and will also store the file containing the input. In case you want the old mode, you have to set memory option to 'load' in your main.cfg file. Fix issue with loading R ZOO-Service located in a subdirectory. Support for XML Execute request containing TEXT_NODE when CDATA_NODE should be used.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_r.c

    r877 r880  
    110110  if(tmp!=NULL){
    111111    if(mp!=NULL && strlen(mp->value)>0){
    112       char *mps=zStrdup(mp->value);
    113       int i,len=strlen(mps);
    114       int j=0;
    115       for(i=0;i<len;i++){
    116         if(mps[i]=='/'){
    117           mps[i]='.';
    118         }
    119       }
    120       char *mn=(char*)malloc((strlen(mps)+strlen(tmp->value)+2)*sizeof(char));
    121       sprintf(mn,"%s.%s",mps,tmp->value);
     112      char *mn=(char*)malloc((strlen(mp->value)+strlen(tmp->value)+2)*sizeof(char));
     113      sprintf(mn,"%s/%s",mp->value,tmp->value);
    122114      pName = mkString(mn);
    123115      free(mn);
    124       free(mps);
    125116    }
    126117    else{
    127       dumpMap(tmp);
    128118      char *tmpStr=(char*)malloc((strlen(r_path)+strlen(tmp->value)+2)*sizeof(char));
    129119      sprintf(tmpStr,"%s/%s",r_path,tmp->value);
     
    189179        char* finalStr=(char*)malloc((strlen(tmpStr)+strlen(_("Unable to run your R service: "))+2)*sizeof(char));
    190180        sprintf(finalStr,"%s %s",_("Unable to run your R service: "),tmpStr);
    191         fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,tmpStr);
    192         fflush(stderr);
    193181        errorException(*main_conf,finalStr,"NoApplicableCode",NULL);
    194182        free(finalStr);
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