Changeset 954 for trunk

Timestamp:

Sep 10, 2019, 11:20:32 PM (5 years ago)

Author:

djay

Message:

Use rootUrl rather than serverAddress

File:

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

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

@@ -520 +520 @@
       json_object_object_add(res2,"type",json_object_new_string("application/json"));
       json_object_object_add(res2,"title",json_object_new_string("Process Description"));
-      map* tmpUrl=getMapFromMaps(m,"main","serverAddress");
+      map* tmpUrl=getMapFromMaps(m,"openapi","rootUrl");
       char* tmpStr=(char*) malloc((strlen(tmpUrl->value)+strlen(rUrl)+13)*sizeof(char));
       sprintf(tmpStr,"%s/processes/%s/",tmpUrl->value,rUrl);
@@ -1141 +1141 @@
   int createStatusLinks(maps* conf,int result,json_object* obj){
     json_object* res=json_object_new_array();
-    map *tmpPath = getMapFromMaps (conf, "main", "serverAddress");
+    map *tmpPath = getMapFromMaps (conf, "openapi", "rootUrl");
     map *cIdentifier = getMapFromMaps (conf, "lenv", "oIdentifier");
     map *sessId = getMapFromMaps (conf, "lenv", "usid");
@@ -1341 +1341 @@
       json_object_object_add(res1,"description",json_object_new_string(tmpMap->value));
       json_object_object_add(res5,"description",json_object_new_string(tmpMap->value));
-      tmpMap=getMapFromMaps(conf,"main","serverAddress");
+      tmpMap=getMapFromMaps(conf,"openapi","rootUrl");
       json_object_object_add(res5,"url",json_object_new_string(tmpMap->value));
     }