Changeset 640 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

May 28, 2015, 4:25:06 PM (9 years ago)

Author:

djay

Message:

First version including zoo_service shared library

File:

• trunk/zoo-project/zoo-kernel/zoo_service_loader.c (modified) (9 diffs)

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

@@ -54 +54 @@
 
 #include "service_internal.h"
+#include "server_internal.h"
+#include "response_print.h"
 #include "request_parser.h"
+#include "sqlapi.h"
 
 #ifdef USE_PYTHON
@@ -1044 +1047 @@
   r_inputs = getMap (request_inputs, "language");
   if (r_inputs == NULL)
+    r_inputs = getMap (request_inputs, "AcceptLanguages");
+  if (r_inputs == NULL)
     r_inputs = getMapFromMaps (m, "main", "language");
   if (r_inputs != NULL)
@@ -1141 +1146 @@
     NULL
   };
-  checkValidValue(request_inputs,&err,"Request",(const char**)vvr,1);
+  checkValidValue(request_inputs,&err,"request",(const char**)vvr,1);
   const char *vvs[]={
     "WPS",
@@ -1161 +1166 @@
   }
   checkValidValue(request_inputs,&err,"service",(const char**)vvs,1);
+
   const char *vvv[]={
     "1.0.0",
+    "2.0.0",
     NULL
   };
@@ -1172 +1179 @@
   }else{
     checkValidValue(request_inputs,&err,"AcceptVersions",(const char**)vvv,-1);
+    map* version=getMap(request_inputs,"AcceptVersions");
+    if(version!=NULL){
+      if(strstr(version->value,schemas[1][0])!=NULL)
+        addToMap(request_inputs,"version",schemas[1][0]);
+      else
+        addToMap(request_inputs,"version",version->value);
+    }
   }
+  map* version=getMap(request_inputs,"version");
+  if(version==NULL)
+    version=getMapFromMaps(m,"main","version");
+  setMapInMaps(m,"main","rversion",version->value);
   if(err!=NULL){
     printExceptionReportResponse (m, err);
@@ -1237 +1255 @@
       r_inputs = NULL;
       //r_inputs = getMap (request_inputs, "ServiceProvider");
-      xmlNodePtr n=printGetCapabilitiesHeader(doc,m);
+      r_inputs = getMap (request_inputs, "version");
+      xmlNodePtr n=printGetCapabilitiesHeader(doc,m,(r_inputs!=NULL?r_inputs->value:"1.0.0"));
       /**
        * Here we need to close stdout to ensure that unsupported chars 
@@ -1299 +1318 @@
           xmlDocPtr doc = xmlNewDoc (BAD_CAST "1.0");
           r_inputs = NULL;
+          r_inputs = getMap (request_inputs, "version");
+          map* version=getMapFromMaps(m,"main","rversion");
+          int vid=getVersionId(version->value);
           xmlNodePtr n = printWPSHeader(doc,m,"DescribeProcess",
-                                        "ProcessDescriptions");
+                                        root_nodes[vid][1],(r_inputs!=NULL?r_inputs->value:"1.0.0"),1);
 
           r_inputs = getMap (request_inputs, "Identifier");
@@ -1748 +1770 @@
    *  - usid : it is an unique identification number 
    *  - sid : it is the process idenfitication number (OS)
+   *  - uusid : it is an universally unique identification number 
    *  - status : value between 0 and 100 to express the  completude of 
    * the operations of the running service 
@@ -1777 +1800 @@
   sprintf (tmpBuff, "%i", cpid);
   addToMap (_tmpMaps->content, "sid", tmpBuff);
+  char* tmpUuid=get_uuid();
+  addToMap (_tmpMaps->content, "uusid", tmpUuid);
+  free(tmpUuid);
   addToMap (_tmpMaps->content, "status", "0");
   addToMap (_tmpMaps->content, "cwd", ntmp);