Changeset 850 for branches/prototype-v0/zoo-project/zoo-kernel/service_callback.c

Timestamp:

Aug 29, 2017, 10:52:39 AM (7 years ago)

Author:

djay

Message:

Fix various memory leaks and enhance the callback support. Add the prohibited keyword to the callback section to avoid calling callback for such services.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_callback.c (modified) (5 diffs)

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

@@ -35 +35 @@
 #endif
 
+  /**
+   * Check if a service name is prohibited, meaning that we don't have to invoke
+   * the callback for this specific service.
+   *
+   */
+  bool isProhibited(maps* conf,const char* serviceName){
+    map* plist=getMapFromMaps(conf,"callback","prohibited");
+    if(plist!=NULL){
+      char *tmp=plist->value;
+      char *tmpS=strtok(tmp,",");
+      while(tmpS!=NULL){
+        if(strcmp(serviceName,tmpS)==0)
+          return true;
+        tmpS=strtok(NULL,",");
+      }
+    }
+    return false;
+  }
+  
   /**
    * Invoke the callback in case there is a [callback] section containing a url parameter
@@ -57 +76 @@
     if(url==NULL)
       return false;
-
+      
     maps* lenv=getMaps(m,"lenv");
-
+    map* sname=getMap(lenv->content,"identifier");
+    if(sname!=NULL && isProhibited(m,sname->value))
+      return false;
+      
     json_object *res=json_object_new_object();
 
@@ -87 +109 @@
       maps* curs=inputs;
       
-      char *keys[4][2]={
+      char *keys[8][2]={
         {
           "href",
@@ -103 +125 @@
           "size",
           "size"
-        }
+        },
+        {
+          "ref_wms_link",
+          "ref_wms_link"
+        },
+        {
+          "ref_wcs_link",
+          "ref_wcs_link"
+        },
+        {
+          "ref_wfs_link",
+          "ref_wfs_link"
+        },
+        {
+          "datatype",
+          "datatype"
+        }       
       };
       json_object *res1=json_object_new_object();
       while(curs!=NULL){
         map* tmpMap=getMap(curs->content,"cache_file");
-        if(tmpMap!=NULL){
+        sid=getMap(curs->content,"ref_wms_link");
+        if(tmpMap!=NULL && sid==NULL){
           addToMap(curs->content,"generated_file",tmpMap->value);
           tmpMap=getMap(curs->content,"fmimeType");
@@ -121 +160 @@
         int i=0;
         int hasRef=-1;
-        for(;i<4;i++){
+        for(;i<8;i++){
           sid=getMap(curs->content,keys[i][0]);
           if(sid!=NULL){