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

Timestamp:

May 3, 2017, 12:53:06 PM (7 years ago)

Author:

djay

Message:

Commit the minimal requirements for remote HPC support

File:

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

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

@@ -1 +1 @@
 /*
- * Author : David Saggiorato
- *          Gérald Fenoy
+ * Authors : David Saggiorato
+ *           Gérald Fenoy
  *  Copyright 2015 GeoLabs SARL. All rights reserved.
  *
@@ -23 +23 @@
  */
 
-#ifdef RELY_ON_DB
 #include "ogr_api.h"
 #include "ogrsf_frmts.h"
@@ -52 +51 @@
 
 /**
- * Create a GDAL / OGR string for connecting to the db backend
- * (do not support active_schema)
- * 
- * @param conf the maps containing the setting of the main.cfg file
- */
-char* createInitString(maps* conf){
+ * Create a GDAL / OGR string for connecting to a db backend defined in the
+ * key section.
+ * 
+ * @param conf the maps containing the setting of the main.cfg file
+ * @param key the name of the section containing the connection setting
+ * @return the OGR connection string
+ */
+char* _createInitString(maps* conf,const char* key){
   char* res=NULL;
-  char keywords[5][9]={
+  char keywords[6][14]={
     "dbname",
     "host",
     "port",
     "user",
-    "password"
+    "password",
+    "active_schema"    
   };
   int i=0;
-  maps* cconf=getMaps(conf,"database");
+  maps* cconf=getMaps(conf,key);
   int len=0;
-  for(i=0;i<5;i++){
+  for(i=0;i<6;i++){
     map* tmp=getMap(cconf->content,keywords[i]);
+    fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
+    fflush(stderr);
     if(tmp!=NULL){
+      fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
+      fflush(stderr);
       if(res==NULL){
         res=(char*)malloc((strlen(keywords[i])+strlen(tmp->value)+4)*sizeof(char));
@@ -83 +89 @@
         len+=strlen(res1);
         res[len]=0;
+        fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
+        fflush(stderr);
         free(res1);
       }
     }
-  }
+    fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
+    fflush(stderr);
+  }
+  fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
+  fflush(stderr);
   map* tmp=getMap(cconf->content,"type");
   if(tmp!=NULL){
@@ -98 +110 @@
 
 /**
- * Connect to the db backend.
+ * Create a GDAL / OGR string for connecting to the db backend
+ * 
+ * @param conf the maps containing the setting of the main.cfg file
+ * @return the OGR connection string
+ */
+char* createInitString(maps* conf){
+  return _createInitString(conf,"database");
+}
+
+/**
+ * Connect to a db backend.
  * 
  * @param conf the maps containing the setting of the main.cfg file
  * @see createInitString
  */
-void init_sql(maps* conf){
-  char* sqlInitString=createInitString(conf);
+void _init_sql(maps* conf,const char* key){
+  char* sqlInitString=_createInitString(conf,key);
   OGRSFDriver *poDriver = NULL;
   OGRRegisterAll();
@@ -129 +151 @@
 #endif
   free(sqlInitString);
+}
+
+/**
+ * Connect to the db backend.
+ * 
+ * @param conf the maps containing the setting of the main.cfg file
+ * @see createInitString
+ */
+void init_sql(maps* conf){
+  return _init_sql(conf,"database");
 }
 
@@ -158 +190 @@
 
 /**
+ * Fetch a tuple set by executing a SQL query to the Database Backend.
+ * 
+ * @param conf the maps containing the setting of the main.cfg file
+ * @param sqlQuery the SQL query to run
+ * @return NULL in case of failure or an OGRLayer pointer if the query succeed.
+ */
+OGRLayer *fetchSql(maps* conf,const char* sqlQuery){
+  OGRLayer *res=NULL;
+  res = zoo_DS->ExecuteSQL( sqlQuery, NULL, NULL);
+  return res;
+}
+
+void cleanFetchSql(maps* conf,OGRLayer *objects){
+  if( objects != NULL ){
+    zoo_DS->ReleaseResultSet( objects );
+    objects=NULL;
+  }
+}
+
+/**
  * Execute a SQL query to the SQL Database Backend.
  * 
@@ -165 +217 @@
  */
 int execSql(maps* conf,const char* sqlQuery){
+  int res=-1;
   zoo_ResultSet = zoo_DS->ExecuteSQL( sqlQuery, NULL, NULL);
   if( zoo_ResultSet != NULL ){
-    return 1;
-  }
-  return -1;
+    res=1;
+  }
+  zoo_DS->ReleaseResultSet( zoo_ResultSet );
+  return res;
 }
 
@@ -260 +314 @@
 }
 
+#ifdef RELY_ON_DB
 /**
  * Update the current status of the running service.