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

Timestamp:

Jun 29, 2016, 3:40:46 PM (7 years ago)

Author:

djay

Message:

Give the capability to store the main.cfg file in sysconfdir and the services in servicePath if defined in the [main] section.

File:

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

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

@@ -27 +27 @@
 #include "ogrsf_frmts.h"
 #include "ogr_p.h"
+#if GDAL_VERSION_MAJOR >= 2
+#include <gdal_priv.h>
+#endif
 
 #include "sqlapi.h"
@@ -35 +38 @@
  * Global GDALDataset pointer
  */
-OGRDataSource *zoo_DS = NULL;
+#if GDAL_VERSION_MAJOR >=2
+GDALDataset
+#else
+OGRDataSource 
+#endif
+ *zoo_DS = NULL;
 
 /**
@@ -98 +106 @@
   OGRSFDriver *poDriver = NULL;
   OGRRegisterAll();
+
+#if GDAL_VERSION_MAJOR >= 2
+  zoo_DS = (GDALDataset*) GDALOpenEx( sqlInitString,
+                                      GDAL_OF_UPDATE | GDAL_OF_VECTOR,
+                                      NULL, NULL, NULL );
+#else
   zoo_DS = OGRSFDriverRegistrar::Open(sqlInitString,false,&poDriver);
+#endif
   if( zoo_DS == NULL ){
 #ifdef DEBUG
@@ -124 +139 @@
     zoo_DS->ReleaseResultSet( zoo_ResultSet );
   if(zoo_DS!=NULL){
+#if GDAL_VERSION_MAJOR >= 2
+    GDALClose(zoo_DS);
+#else
     OGRDataSource::DestroyDataSource( zoo_DS );
+#endif
     zoo_DS=NULL;
   }