Changeset 865 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

Timestamp:

Feb 8, 2018, 12:37:09 PM (6 years ago)

Author:

djay

Message:

Use correct declaration of the zo_DS variable in libzoo_service.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c (modified) (2 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_ms.c

@@ -1381 +1381 @@
   myMap->transparent=1;
 
-  /**
-   * Set metadata extracted from main.cfg file maps
-   */
-  maps* cursor=conf;
-  map* correspondance=getCorrespondance();
-  while(cursor!=NULL){
-    map* _cursor=cursor->content;
-    map* vMap;
-    while(_cursor!=NULL){
-      if((vMap=getMap(correspondance,_cursor->name))!=NULL){
-        if (msInsertHashTable(&(myMap->web.metadata), vMap->value, _cursor->value) == NULL){
-#ifdef DEBUGMS
-          fprintf(stderr,"Unable to add metadata");
-#endif
-          return;
-        }
-      }
-      _cursor=_cursor->next;
-    }
-    cursor=cursor->next;
-  }
-  freeMap(&correspondance);
-  free(correspondance);
-
   /*
    * Set mapserver PROJ_LIB/GDAL_DATA or any other config parameter from 
@@ -1445 +1421 @@
   }
   msInsertHashTable(&(myMap->web.metadata), "ows_srs", "EPSG:4326");
+
+  /**
+   * Set metadata extracted from main.cfg file maps
+   */
+  maps* cursor=conf;
+  map* correspondance=getCorrespondance();
+  while(cursor!=NULL){
+    if(strstr(cursor->name,"_help")==NULL){
+      map* _cursor=cursor->content;
+      map* vMap;
+      while(_cursor!=NULL){
+        if((vMap=getMap(correspondance,_cursor->name))!=NULL){
+          if (msInsertHashTable(&(myMap->web.metadata), vMap->value, _cursor->value) == NULL){
+#ifdef DEBUGMS
+            fprintf(stderr,"Unable to add metadata");
+#endif
+            freeMap(&correspondance);
+            free(correspondance);
+            return;
+          }
+        }
+        _cursor=_cursor->next;
+      }
+    }
+    cursor=cursor->next;
+  }
+  freeMap(&correspondance);
+  free(correspondance);
+
 
   if(tryOgr(conf,outputs,myMap)<0)