Changeset 483


Ignore:
Timestamp:
May 30, 2014, 12:14:04 PM (5 years ago)
Author:
djay
Message:

Fix issue with namspaces in printExceptionReportResponse when Header were already created.

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

Legend:

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

    r481 r483  
    382382int zooXmlAddNs(xmlNodePtr nr,const char* url,const char* name){
    383383#ifdef DEBUG
    384   fprintf(stderr,"zooXmlAddNs %d \n",nbNs);
     384  fprintf(stderr,"zooXmlAddNs %d %s \n",nbNs,name);
    385385#endif
    386386  int currId=-1;
     
    20282028  xmlNodePtr n;
    20292029
     2030  zooXmlCleanupNs();
    20302031  doc = xmlNewDoc(BAD_CAST "1.0");
    20312032  maps* tmpMap=getMaps(m,"main");
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r481 r483  
    198198    return 1;
    199199  DIR *dirp = opendir(conf_dir);
    200   if(dirp==NULL){
    201     dup2(saved_stdout,fileno(stdout));
    202     errorException(m, _("The specified path doesn't exist."),"InvalidParameterValue","metapath");
    203     return -1;
     200  if(dirp==NULL){
     201    if(level>0)
     202      return 1;
     203    else
     204      return -1;
    204205  }
    205206  char tmp1[25];
     
    888889    int saved_stdout = dup(fileno(stdout));
    889890    dup2(fileno(stderr),fileno(stdout));
    890     if(int res=recursReaddirF(m,n,conf_dir,NULL,saved_stdout,0,printGetCapabilitiesForProcess)<0)
     891    if(int res=recursReaddirF(m,n,conf_dir,NULL,saved_stdout,0,printGetCapabilitiesForProcess)<0){
     892      freeMaps(&m);
     893      free(m);
     894      free(REQUEST);
     895      free(SERVICE_URL);
     896      fflush(stdout);
    891897      return res;
     898    }
    892899    dup2(saved_stdout,fileno(stdout));
    893900    printDocument(m,doc,getpid());
     
    25032510       * this way the data will be updated at the end of the process run.
    25042511       */
    2505       printProcessResponse(m,request_inputs,cpid,
    2506                            s1,r_inputs1->value,SERVICE_STARTED,
    2507                            request_input_real_format,
    2508                            request_output_real_format);
     2512      printProcessResponse(m,request_inputs,cpid,s1,r_inputs1->value,SERVICE_STARTED,
     2513                           request_input_real_format,request_output_real_format);
    25092514#ifndef WIN32
    25102515      fflush(stdout);
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