Changeset 490 for trunk/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

Jun 27, 2014, 1:14:39 AM (10 years ago)

Author:

djay

Message:

Remove memory leaks from ZOO-Kernel. Fix issue #99.

File:

• trunk/zoo-project/zoo-kernel/service_internal_ms.c (modified) (3 diffs)

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -129 +129 @@
   if(strncasecmp(rformat->value,"image/tiff",10)==0)
     proto=2;
-  if(protoMap!=NULL)
+  if(protoMap!=NULL){
     if(strncasecmp(protoMap->value,"WMS",3)==0)
       proto=0;
-    else if(strncasecmp(protoMap->value,"WFS",3)==0)
-      proto=1;
-    else 
-      proto=2;
-  
+    else{
+      if(strncasecmp(protoMap->value,"WFS",3)==0)
+        proto=1;
+      else 
+        proto=2;
+    }
+  }
   char *protoVersion=options[proto][1];
   if(proto==1){
@@ -278 +280 @@
       msLoadProjectionStringEPSG(&myLayer->projection,msSrs->value);
       char tmpSrs[128];
-      sprintf(tmpSrs,"%s EPSG:4326 EPSG:900913",msSrs);
+      sprintf(tmpSrs,"%s EPSG:4326 EPSG:900913",msSrs->value);
       msInsertHashTable(&(m->web.metadata),"ows_srs",tmpSrs);
       msInsertHashTable(&(myLayer->metadata),"ows_srs",tmpSrs);
@@ -574 +576 @@
       msInsertHashTable(&(myLayer->metadata), "ows_srs", "EPSG:4326 EPSG:900913");
     }
-
-    map* crs=getMap(output->content,"crs");
-    map* isGeo=getMap(output->content,"crs_isGeographic");
 
     OGREnvelope oExt;