Changeset 926 for trunk/zoo-project

Timestamp:

May 28, 2019, 11:33:18 AM (6 years ago)

Author:

djay

Message:

Fix issue with version parameter for GetCapabilities?, issue with DescribeProcess? (version 2.0.0) and fix to build on MacOS

Location:

trunk/zoo-project/zoo-kernel

Files:

• response_print.c (modified) (6 diffs)
• response_print.h (modified) (1 diff)
• service_callback.c (modified) (4 diffs)
• service_internal_python.c (modified) (4 diffs)
• sqlapi.c (modified) (1 diff)
• sqlapi.h (modified) (1 diff)
• zoo_service_loader.c (modified) (2 diffs)

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

@@ -23 +23 @@
  */
 
-#include "service.h"
-#include "service_internal.h"
-#include "server_internal.h"
-#include "response_print.h"
 #ifdef USE_MS
 #include "service_internal_ms.h"
@@ -35 +31 @@
 #include "service_callback.h"
 #endif
+#include "service.h"
+#include "service_internal.h"
+#include "server_internal.h"
+#include "response_print.h"
 
 #ifndef WIN32
@@ -41 +41 @@
 
 #include "mimetypes.h"
-
 
 /**
@@ -1014 +1013 @@
 
   n=nc;
-  
   int wpsId=zooXmlAddNs(NULL,schemas[vid][3],"wps");
   ns=usedNs[wpsId];
@@ -1427 +1425 @@
         int oI=0;
         /*if(vid==0)*/ {
-          for(oI=0;oI<13;oI++)
+          for(oI=0;oI<12;oI++)
             if((tmp1=getMap(_tmp->content,orderedFields[oI]))!=NULL){
 #ifdef DEBUG
@@ -2101 +2099 @@
     printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
   }
-  fflush(stdout);
   xmlChar *xmlbuff;
   int buffersize;

trunk/zoo-project/zoo-kernel/response_print.h

@@ -94 +94 @@
 #include <libxml/parser.h>
 #include <libxml/xpath.h>
+#include "cgic.h"
 
 #ifdef __cplusplus

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

@@ -435 +435 @@
       maps* curs=inputs;
       dumpMaps(curs);
-      char *keys[11][2]={
+      const char *keys[11][2]={
         {
           "xlink:href",
@@ -614 +614 @@
       maps* curs=outputs;
       dumpMaps(curs);
-      char *keys[10][2]={
+      const char *keys[10][2]={
         {
           "Reference",
@@ -656 +656 @@
         }       
       };
-      char* specifics[5][2]={
+      const char* specifics[5][2]={
         {
           "download_link",
@@ -767 +767 @@
     case 6: {
       // Finalize HPC
-      char *keys[6][2]={
+      const char *keys[6][2]={
         {
           //"SubmitTime",

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

@@ -351 +351 @@
   PyObject *ptype, *pvalue, *ptraceback,*pValue,*pArgs;
   PyErr_Fetch(&ptype, &pvalue, &ptraceback);
-  char *pStrErrorMessage = PyString_AsString(pvalue);
+  const char *pStrErrorMessage = PyString_AsString(pvalue);
   char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
   
@@ -698 +698 @@
     if(strncmp(PyString_AsString(key),"child",5)!=0){
       if(strncmp(PyString_AsString(key),"value",5)==0){
-        char *buffer=NULL;
+        const char *buffer=NULL;
         Py_ssize_t size;
 #if PY_MAJOR_VERSION >= 3
@@ -720 +720 @@
         res = addToMapWithSize(res,PyString_AsString(key),buffer,size);
       }else{
-        char* lkey=PyString_AsString(key);
-        char* lvalue=PyString_AsString(value);
+        const char* lkey=PyString_AsString(key);
+        const char* lvalue=PyString_AsString(value);
         if(res!=NULL){
           if(PyString_Size(value)>0)
@@ -759 +759 @@
         PyObject* key;
         PyObject* value;
-        char *buffer = NULL;
+        const char *buffer = NULL;
         Py_ssize_t size;
         for(int i = 0; i < nb; i++) {

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

@@ -71 +71 @@
   maps* cconf=getMaps(conf,key);
   if(cconf==NULL){
-    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
     return "-1";
   }

trunk/zoo-project/zoo-kernel/sqlapi.h

@@ -51 +51 @@
 #endif
 
-  
 #ifdef META_DB
   ZOO_DLL_EXPORT char* _createInitString(maps*,const char*);

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

@@ -1240 +1240 @@
   }else{
     checkValidValue(request_inputs,&err,"AcceptVersions",(const char**)vvv,-1);
+    map* tmpMap=getMapFromMaps(m,"main","version");
+    if(tmpMap!=NULL){
+      setMapInMaps(m,"main","rversion",tmpMap->value);
+      addToMap(request_inputs,"version",tmpMap->value);
+    }else{
+      setMapInMaps(m,"main","rversion","1.0.0");
+      addToMap(request_inputs,"version","1.0.0");
+    }
     map* version1=getMap(request_inputs,"AcceptVersions");
     if(version1!=NULL){
@@ -1247 +1255 @@
         addToMap(request_inputs,"version",version1->value);
       version=getMap(request_inputs,"version");
-      setMapInMaps(m,"main","rversion",version->value);
-      vid=getVersionId(version->value);
     }
   }