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

Timestamp:

Nov 21, 2017, 10:24:14 AM (6 years ago)

Author:

djay

Message:

HPC support update. Add inputs for create options in Gdal_Dem.

File:

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

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

@@ -70 +70 @@
   int i=0;
   maps* cconf=getMaps(conf,key);
-  if(cconf==NULL)
+  if(cconf==NULL){
+    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
     return "-1";
+  }
   int len=0;
   for(i=0;i<6;i++){
@@ -119 +121 @@
 int _init_sql(maps* conf,const char* key){
   char* sqlInitString=_createInitString(conf,key);
+  fprintf(stderr,"Try to connect to: %s %s !\n",key,sqlInitString);
+  fflush(stderr);  
   if(strncmp(sqlInitString,"-1",2)==0)
     return -1;
+  fprintf(stderr,"Try to connect to: %s !\n",key);
+  fflush(stderr);  
   OGRSFDriver *poDriver = NULL;
   OGRRegisterAll();
@@ -195 +201 @@
  */
 void close_sql(maps* conf,int cid){
-  if( zoo_ResultSet != NULL )
+  if( zoo_ResultSet != NULL ){
     zoo_DS[cid]->ReleaseResultSet( zoo_ResultSet );
-  if(zoo_DS!=NULL){
+    zoo_ResultSet=NULL;
+  }
+  if(zoo_DS!=NULL && zoo_DS[cid]!=NULL){
 #if GDAL_VERSION_MAJOR >= 2
     GDALClose(zoo_DS[cid]);
@@ -223 +231 @@
  */
 OGRLayer *fetchSql(maps* conf,int cid,const char* sqlQuery){
-  if(zoo_DS[cid]==NULL)
+  if(zoo_DS==NULL || zoo_DS[cid]==NULL)
     return NULL;
   OGRLayer *res=NULL;
@@ -250 +258 @@
 int execSql(maps* conf,int cid,const char* sqlQuery){
   int res=-1;
+  if(zoo_DS == NULL || zoo_DS[cid]==NULL)
+    return -1;
   zoo_ResultSet = zoo_DS[cid]->ExecuteSQL( sqlQuery, NULL, NULL);
   if( zoo_ResultSet != NULL ){
@@ -371 +381 @@
   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==
-#ifdef META_DB
-      1
-#else
-      0
-#endif
-      ){
+  if(zoo_ds_nb==0){
     init_sql(conf);
     zoo_ds_nb++;
   }
-  execSql(conf,zoo_ds_nb-1,sqlQuery);
-  cleanUpResultSet(conf,zoo_ds_nb-1);
-  free(sqlQuery);
+  execSql(conf,0,sqlQuery);
+  cleanUpResultSet(conf,0);
+  close_sql(conf,0);
+  free(sqlQuery);
+  setMapInMaps(conf,"lenv","ds_nb","0");
   return 0;
 }
@@ -439 +445 @@
   int zoo_ds_nb=getCurrentId(conf);
   map *schema=getMapFromMaps(conf,"database","schema");
+  OGRFeature  *poFeature = NULL;
+  const char *tmp1=NULL;
+  int hasRes=-1;
   char *sqlQuery=(char*)malloc((strlen(schema->value)+strlen(pid)+82+1)*sizeof(char));
   sprintf(sqlQuery,
@@ -454 +463 @@
   }
   execSql(conf,zoo_ds_nb-1,sqlQuery);
-  OGRFeature  *poFeature = NULL;
-  const char *tmp1;
-  int hasRes=-1;
   if(zoo_ResultSet!=NULL){
       while( (poFeature = zoo_ResultSet->GetNextFeature()) != NULL ){
@@ -472 +478 @@
   if(hasRes<0)
     tmp1=NULL;
-  else
-    cleanUpResultSet(conf,zoo_ds_nb-1);
+  cleanUpResultSet(conf,zoo_ds_nb-1);
   free(sqlQuery);
   return (char*)tmp1;
@@ -534 +539 @@
   //close_sql(conf,zoo_ds_nb-1);
   free(sqlQuery);
-  end_sql();
+  //end_sql();
 }
 
@@ -555 +560 @@
     zoo_ds_nb++;
   }
-  execSql(conf,zoo_ds_nb-1,sqlQuery);
+  if(execSql(conf,zoo_ds_nb-1,sqlQuery)<0)
+    return NULL;
   OGRFeature  *poFeature = NULL;
   const char *tmp1;