Changeset 860 for branches/prototype-v0/zoo-project/zoo-kernel/sqlapi.c

Timestamp:

Dec 12, 2017, 4:09:47 PM (6 years ago)

Author:

djay

Message:

Add status_code key to the lenv section to support returning a specific HTTP error code from the service code. Fix callback invocation to support inputs arrays at step 1 and 2. Fix issue with cpu usage. Fix issue with mapserver publication when an input is optional. Fix callback invocation at step 7 in case the service has failed on the HPC side.

File:

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

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

@@ -121 +121 @@
 int _init_sql(maps* conf,const char* key){
   char* sqlInitString=_createInitString(conf,key);
+#ifdef SQL_DEBUG
   fprintf(stderr,"Try to connect to: %s %s !\n",key,sqlInitString);
   fflush(stderr);  
+#endif
   if(strncmp(sqlInitString,"-1",2)==0)
     return -1;
-  fprintf(stderr,"Try to connect to: %s !\n",key);
-  fflush(stderr);  
   OGRSFDriver *poDriver = NULL;
   OGRRegisterAll();
@@ -165 +165 @@
 #endif
   if( zoo_DS[zoo_ds_nb] == NULL ){
-#ifdef DEBUG
+#ifdef SQL_DEBUG
     fprintf(stderr,"sqlInitString: %s FAILED !\n",sqlInitString);
     fflush(stderr);
@@ -174 +174 @@
     return -2;
   }
-#ifdef DEBUG
+#ifdef SQL_DEBUG
   fprintf(stderr,"sqlInitString: %s SUCEED !\n",sqlInitString);
   fflush(stderr);
 #endif
-  fprintf(stderr,"sqlInitString: %s SUCEED %d !\n",sqlInitString,zoo_ds_nb);
-  fflush(stderr);  
   free(sqlInitString);
   zoo_ds_nb++;
@@ -234 +232 @@
     return NULL;
   OGRLayer *res=NULL;
-#ifdef DEBUG
+#ifdef SQL_DEBUG
   fprintf(stderr,"************************* %s %s %d\n\n",sqlQuery,__FILE__,__LINE__);
   fflush(stderr);
@@ -381 +379 @@
   char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(msg->value)+strlen(p->value)+strlen(sid->value)+64+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_nb==0){
+  if( zoo_ds_nb==
+#ifdef META_DB
+      1
+#else
+      0
+#endif     
+     ){
     init_sql(conf);
     zoo_ds_nb++;