Changeset 962 for trunk/zoo-project/zoo-kernel/sqlapi.c

Timestamp:

Oct 21, 2020, 6:31:09 PM (4 years ago)

Author:

djay

Message:

Update OGC API - Processes documentation and implementation, providing a browsable User Interface to Processes.

File:

• trunk/zoo-project/zoo-kernel/sqlapi.c (modified) (4 diffs)

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

@@ -33 +33 @@
 #include <fcgi_stdio.h>
 #include "sqlapi.h"
+#include "service_callback.h"
 
 /**
@@ -375 +376 @@
   map *msg=getMapFromMaps(conf,"lenv","message");
   map *schema=getMapFromMaps(conf,"database","schema");
-  char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(msg->value)+strlen(p->value)+strlen(sid->value)+64+1)*sizeof(char));
+  char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(msg->value)+strlen(p->value)+strlen(sid->value)+62+1)*sizeof(char));
   sprintf(sqlQuery,"UPDATE %s.services set status=$$%s$$,message=$$%s$$ where uuid=$$%s$$;",schema->value,p->value,msg->value,sid->value);
   if( zoo_DS == NULL || zoo_DS[zoo_ds_nb-1]==NULL ){
+    if(getMapFromMaps(conf,"lenv","file.log")==NULL){
+      free(sqlQuery);
+      return 1;
+    }
     init_sql(conf);
     zoo_ds_nb++;
@@ -384 +389 @@
   cleanUpResultSet(conf,zoo_ds_nb-1);
   free(sqlQuery);
+  invokeBasicCallback(conf,SERVICE_STARTED);
   return 0;
 }
@@ -398 +404 @@
   int created=-1;
   map *schema=getMapFromMaps(conf,"database","schema");
-  char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(pid)+58+1)*sizeof(char));
-  sprintf(sqlQuery,"select status||'|'||message from %s.services where uuid=$$%s$$;",schema->value,pid);
+  char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(pid)+104+1)*sizeof(char));  
+  sprintf(sqlQuery,"select CASE WHEN message is null THEN '-1' ELSE status||'|'||message END from %s.services where uuid=$$%s$$;",schema->value,pid);
   if( zoo_ds_nb==
 #ifdef META_DB