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

Timestamp:

Aug 7, 2012, 12:28:05 PM (12 years ago)

Author:

djay

Message:

Fix multiple values for the same identifier.

File:

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

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

@@ -175 +175 @@
       OSRImportFromWkt( hSRS, &pszProjection ) == CE_None ){
     char *proj4Str=NULL;
-    if(OSRGetAuthorityName(hSRS,NULL)!=NULL && OSRGetAuthorityCode(hSRS,NULL)!=NULL){
+    if(OSRGetAuthorityName(hSRS,NULL)!=NULL && 
+       OSRGetAuthorityCode(hSRS,NULL)!=NULL){
       char tmpSrs[20];
       sprintf(tmpSrs,"%s:%s",
@@ -236 +237 @@
     }
     if(msSrs!=NULL){
-      if(output!=NULL){
-        addToMap(output->content,"crs",msSrs->value);
-        addToMap(output->content,"crs_isGeographic","true");
-      }
       msLoadProjectionStringEPSG(&m->projection,msSrs->value);
       msLoadProjectionStringEPSG(&myLayer->projection,msSrs->value);
@@ -247 +244 @@
       msInsertHashTable(&(myLayer->metadata),"ows_srs",tmpSrs);
     }else{
-      if(output!=NULL){
-        addToMap(output->content,"crs","EPSG:4326");
-        addToMap(output->content,"crs_isGeographic","true");
-      }
       msLoadProjectionStringEPSG(&m->projection,"EPSG:4326");
       msLoadProjectionStringEPSG(&myLayer->projection,"EPSG:4326");
       msInsertHashTable(&(m->web.metadata),"ows_srs","EPSG:4326 EPSG:900913");
       msInsertHashTable(&(myLayer->metadata),"ows_srs","EPSG:4326 EPSG:900913");
+    }
+    if(output!=NULL){
+      addToMap(output->content,"crs",msSrs->value);
+      addToMap(output->content,"crs_isGeographic","true");
     }
   }