Changeset 299 for trunk


Ignore:
Timestamp:
Aug 4, 2011, 4:05:02 PM (13 years ago)
Author:
djay
Message:

Fix double mimeType in ExecuteResponse?

Location:
trunk/zoo-kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-kernel/service.h

    r284 r299  
    514514    while(i!=NULL){     
    515515      if(strcasecmp(i->name,"value")!=0 &&
    516          strcasecmp(i->name,"xlink:href")!=0){
     516         strcasecmp(i->name,"xlink:href")!=0 &&
     517         strcasecmp(i->name,"useMapServer")!=0 &&
     518         strcasecmp(i->name,"asReference")!=0){
    517519        map *tmp;
    518520        if(hasKey(m,i->name) && (tmp=getMap(m,i->name))!=NULL &&
  • trunk/zoo-kernel/service_internal.c

    r297 r299  
    15441544         strcasecmp(tmp->name,"uom")==0)
    15451545#ifdef USE_MS
    1546         if(testMap==NULL || (testMap!=NULL && strncasecmp(testMap->value,"text/xml",8)==0))
     1546        if(testMap==NULL || (testMap!=NULL && strncasecmp(testMap->value,"text/xml",8)==0)){
    15471547#endif
    15481548        xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
    15491549#ifdef USE_MS
    1550       if(strcasecmp(tmp->name,"mimeType")==0)
    1551         if(testMap!=NULL)
    1552           xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST testMap->value);
    1553         else
    1554           xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
     1550        }
     1551      else
     1552        if(strcasecmp(tmp->name,"mimeType")==0)
     1553          if(testMap!=NULL)
     1554            xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST testMap->value);
     1555          else
     1556            xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
    15551557#endif
    15561558      tmp=tmp->next;
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