support GV_FORMAT_OGR_DIRECT

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@39547 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/vector/Vlib/build.c

@@ -37,8 +37,10 @@ static int (*Build_array[]) () = {
     Vect_build_nat
 #ifdef HAVE_OGR
 	, Vect_build_ogr
+	, Vect_build_ogr
 #else
 	, format
+        , format
 #endif
 };
 

lib/vector/Vlib/close.c

@@ -43,9 +43,13 @@ static int (*Close_array[][2]) () = {
 #ifdef HAVE_OGR
     , {
     clo_dummy, V1_close_ogr}
+    , {
+    clo_dummy, V1_close_ogr}
 #else
     , {
     clo_dummy, format}
+    , {
+    clo_dummy, format}
 #endif
 };
 

lib/vector/Vlib/field.c

@@ -503,7 +503,7 @@ int Vect_read_dblinks(struct Map_info *Map)
     Vect_reset_dblinks(dbl);
 
     G_debug(3, "Searching for FID column in OGR DB");
-    if (Map->format == GV_FORMAT_OGR) {
+    if (Map->format & (GV_FORMAT_OGR | GV_FORMAT_OGR_DIRECT)) {
 
 #ifndef HAVE_GDAL
 	G_fatal_error(_("The support for OGR vector maps wasn't"

lib/vector/Vlib/open.c

@@ -53,9 +53,13 @@ static int (*Open_old_array[][2]) () = {
 #ifdef HAVE_OGR
     , {
     open_old_dummy, V1_open_old_ogr}
+    , {
+    open_old_dummy, V1_open_old_ogr}
 #else
     , {
     open_old_dummy, format}
+    , {
+    open_old_dummy, format}
 #endif
 };
 

lib/vector/Vlib/read.c

@@ -38,9 +38,13 @@ static int (*Read_next_line_array[][3]) () = {
 #ifdef HAVE_OGR
     , {
     read_next_dummy, V1_read_next_line_ogr, V2_read_next_line_ogr}
+    , {
+    read_next_dummy, V1_read_next_line_ogr, V2_read_next_line_ogr}
 #else
     , {
     read_next_dummy, format, format}
+    , {
+    read_next_dummy, format, format}
 #endif
 };
 

lib/vector/Vlib/rewind.c

@@ -41,9 +41,13 @@ static int (*Rewind_array[][3]) () = {
 #ifdef HAVE_OGR
     , {
     rew_dummy, V1_rewind_ogr, V2_rewind_ogr}
+    , {
+    rew_dummy, V1_rewind_ogr, V2_rewind_ogr}
 #else
     , {
     rew_dummy, format, format}
+    , {
+    rew_dummy, format, format}
 #endif
 };