Changeset 939


Ignore:
Timestamp:
Jun 14, 2019, 10:08:22 PM (6 months ago)
Author:
djay
Message:

Fix const decelaration to build on windows, pass full children content for text/* ComplexData?.

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

Legend:

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

    r938 r939  
    10701070                                               buffersize);
    10711071                                }
    1072                               else if (cur5 != NULL)/*
    1073                                      && cur5->type == XML_CDATA_SECTION_NODE)*/{
    1074                                 while(cur5!=NULL && cur5->type != XML_CDATA_SECTION_NODE)
    1075                                   cur5=cur5->next;
    1076                                 xmlFree(mv);
    1077                                 if(cur5!=NULL && cur5->content!=NULL){
    1078                                   mv=xmlStrdup(cur5->content);
    1079                                 }
     1072                              else if (cur5 != NULL){
     1073                                if(ltmp!= NULL && strstr(ltmp->value,"text/")!=NULL){
     1074                                  xmlChar *tmp = xmlNodeListGetRawString (doc,
     1075                                                                          cur4->xmlChildrenNode,
     1076                                                                          0);
     1077                                  addToMap (tmpmaps->content, "value",
     1078                                            (char *) tmp);
     1079                                  xmlFree (tmp);
     1080                                }else{
     1081                                  while(cur5!=NULL && cur5->type != XML_CDATA_SECTION_NODE)
     1082                                    cur5=cur5->next;
     1083                                  xmlFree(mv);
     1084                                  if(cur5!=NULL && cur5->content!=NULL){
     1085                                    mv=xmlStrdup(cur5->content);
     1086                                  }
     1087                                }
    10801088                              }
    10811089                            }
     
    18611869  if (r_inputs == NULL){
    18621870    if(mandatory>0){
    1863       char *replace=_("Mandatory parameter <%s> was not specified");
     1871      const char *replace=_("Mandatory parameter <%s> was not specified");
    18641872      char *message=(char*)malloc((strlen(replace)+strlen(toCheck)+1)*sizeof(char));
    18651873      sprintf(message,replace,toCheck);
     
    19101918    }
    19111919    if(hasValidValue<0){
    1912       char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
     1920      const char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
    19131921      nb=0;
    19141922      char *vvalues=NULL;
  • trunk/zoo-project/zoo-kernel/service_internal_hpc.c

    r917 r939  
    6969          dupElements(cur)
    7070        };
    71         char *geoLink="wcs_link";
     71        const char *geoLink="wcs_link";
    7272        if(geo==2){
    7373          geoLink="wfs_link";
     
    213213      zooLock* lck;
    214214      if((lck=lockFile(*conf,argv[1]->value,'r'))==NULL){
    215         char* templateStr=_("Unable to lock the file for %s in read mode.");
     215        const char* templateStr=_("Unable to lock the file for %s in read mode.");
    216216        char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv[0]->value)+1)*sizeof(char));
    217217        sprintf(tmpMessage,templateStr,argv[0]->value);
     
    251251      if(unlockFile(*conf,zoo_file_locks[i])<1){
    252252        map* argv=getMapArray(queueMaps->content,"input",i);
    253         char* templateStr=_("Unable to unlock the file for %s after execution.");
     253        const char* templateStr=_("Unable to unlock the file for %s after execution.");
    254254        char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv->value)+1)*sizeof(char));
    255255        sprintf(tmpMessage,templateStr,argv->value);
  • trunk/zoo-project/zoo-kernel/service_internal_python.c

    r928 r939  
    355355#endif
    356356    char *pStrErrorMessage = PyString_AsString(pvalue);
    357   char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
     357  const char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
    358358 
    359359  PyObject *trace=PyObject_Str(pvalue);
     
    393393      if(pbt!=NULL)
    394394        free(pbt);
    395       char* format=_("%s\nUnable to run your python process properly. Please check the following messages : %s");
     395      const char* format=_("%s\nUnable to run your python process properly. Please check the following messages : %s");
    396396      pbt=(char*)malloc((strlen(format)+strlen(tpbt)+strlen(PyString_AsString(trace))+1)*sizeof(char));
    397397      sprintf(pbt,format,tpbt,PyString_AsString(trace));
     
    400400      if(pbt!=NULL)
    401401        free(pbt);
    402       char* format=_("%s \n Unable to run your python process properly. Unable to provide any further information.");
     402      const char* format=_("%s \n Unable to run your python process properly. Unable to provide any further information.");
    403403      pbt=(char*)malloc((strlen(format)+strlen(tpbt)+strlen(PyString_AsString(trace))+1)*sizeof(char));
    404404      sprintf(pbt,format,tpbt);
  • trunk/zoo-project/zoo-kernel/sshapi.c

    r917 r939  
    730730        if((lck=lockFile(*conf,argv[1]->value,'w'))!=NULL){/**/
    731731          if(ssh_copy(*conf,argv[1]->value,argv[2]->value,ssh_get_cnt(*conf))!=true){
    732             char* templateStr=_("Unable to copy over SSH the file requested for setting the value of %s.");
     732            const char* templateStr=_("Unable to copy over SSH the file requested for setting the value of %s.");
    733733            char *tmpMessage=(char*)malloc((strlen(templateStr)+strlen(argv[0]->value)+1)*sizeof(char));
    734734            sprintf(tmpMessage,templateStr,argv[0]->value);
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