Changeset 26 for trunk/zoo-kernel/service.h

Timestamp:

Sep 24, 2010, 5:11:43 AM (14 years ago)

Author:

djay

Message:

ZOO-Kernel updates and bug fixes :

• Fixing gestion of RawDataOutput? when the Service return SERVICE_FAILED an ExceptionReport? was returned to the client.
• Use gcc when compiling service_internal.c to avoid strange error messages about switch ....
• Function setMapInMaps was added in service.h to let users set the value of a specific map in a maps.
• Fixing JavaScript? issue during the context destruction process.
• Use the GetStatus? ZOO Service when it is available on the local installation for statusLocation.
• Add some comments for ServiceStarted?, ServiceSucceeded?, ServiceFailed? and ServiceAccepted?.
• Dynamic creation of a lenv maps in the main configuration file maps, containing the current status and a sid (Service ID). Those informations can be used later by the GetStatus? Service to let user check the on-going status during the Service runs.
• Function updateStatus was added to service_internal.h which let the Services developers set the current percentCompleted value.

ZOO-Service updates and bug fixes :

• Add GetStatus? Service and its demo longProcess Service. All are in the wps_status.zo Services Provider.
• Use the setMapInMaps in the base-vect-ops code to enhance readibility.

ZOO-API updates :

• Add the function ZOO.UpdateStatus? to the ZOO JavaScript? API which simply point on ZOOUpdateStatus which can be called as-is from JavaScript?. Use : ZOOUpdateStatus(conf,value) where conf is the main configuration file maps and value the the value of the current status.

File:

• trunk/zoo-kernel/service.h (modified) (2 diffs)

trunk/zoo-kernel/service.h

@@ -53 +53 @@
 #define SERVICE_SIZE (ELEMENTS_SIZE*2)+(MAP_SIZE*2)+sizeof(char*)
 
-
-  /*  static char* mtoupper(char* str){
-    char* tmp=strdup(str);
-    if(tmp){
-      int cnt=strlen(tmp);
-      int i;
-      for(i=0;i<cnt;i++){
-        tmp[i]=toupper(str[i]);
-        tmp[i+1]=0;
-      }
-    }
-    else
-      tmp[0]=0;
-    return tmp;
-    }*/
+#define SHMSZ     27
 
   /**
@@ -437 +423 @@
       }
       tmp=tmp->next;
+    }
+  }
+
+
+  static void* setMapInMaps(maps* m,char* key,char* subkey,char *value){
+    maps* _tmpm=getMaps(m,key);
+    if(_tmpm!=NULL){
+      map* _ztmpm=getMap(_tmpm->content,subkey);
+      if(_ztmpm!=NULL){
+        free(_ztmpm->value);
+        _ztmpm->value=strdup(value);
+        dumpMap(_ztmpm);
+      }else{
+        addToMap(_tmpm->content,subkey,value);
+      }
     }
   }