Changeset 299 for trunk

Timestamp:

Aug 4, 2011, 4:05:02 PM (13 years ago)

Author:

djay

Message:

Fix double mimeType in ExecuteResponse?

Location:

trunk/zoo-kernel

Files:

• service.h (modified) (1 diff)
• service_internal.c (modified) (1 diff)

trunk/zoo-kernel/service.h

@@ -514 +514 @@
     while(i!=NULL){      
       if(strcasecmp(i->name,"value")!=0 &&
-         strcasecmp(i->name,"xlink:href")!=0){
+         strcasecmp(i->name,"xlink:href")!=0 &&
+         strcasecmp(i->name,"useMapServer")!=0 &&
+         strcasecmp(i->name,"asReference")!=0){
         map *tmp;
         if(hasKey(m,i->name) && (tmp=getMap(m,i->name))!=NULL && 

trunk/zoo-kernel/service_internal.c

@@ -1544 +1544 @@
          strcasecmp(tmp->name,"uom")==0)
 #ifdef USE_MS
-        if(testMap==NULL || (testMap!=NULL && strncasecmp(testMap->value,"text/xml",8)==0))
+        if(testMap==NULL || (testMap!=NULL && strncasecmp(testMap->value,"text/xml",8)==0)){
 #endif
         xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
 #ifdef USE_MS
-      if(strcasecmp(tmp->name,"mimeType")==0)
-        if(testMap!=NULL)
-          xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST testMap->value);
-        else 
-          xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
+        }
+      else
+        if(strcasecmp(tmp->name,"mimeType")==0)
+          if(testMap!=NULL)
+            xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST testMap->value);
+          else 
+            xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
 #endif
       tmp=tmp->next;