[GRASS-SVN] r39547 - grass/trunk/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-10-17 12:31:02 -0400 (Sat, 17 Oct 2009)
New Revision: 39547

Modified:
   grass/trunk/lib/vector/Vlib/build.c
   grass/trunk/lib/vector/Vlib/close.c
   grass/trunk/lib/vector/Vlib/field.c
   grass/trunk/lib/vector/Vlib/open.c
   grass/trunk/lib/vector/Vlib/read.c
   grass/trunk/lib/vector/Vlib/rewind.c
Log:
support GV_FORMAT_OGR_DIRECT


Modified: grass/trunk/lib/vector/Vlib/build.c
===================================================================
--- grass/trunk/lib/vector/Vlib/build.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/build.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -37,8 +37,10 @@
     Vect_build_nat
 #ifdef HAVE_OGR
 	, Vect_build_ogr
+	, Vect_build_ogr
 #else
 	, format
+        , format
 #endif
 };
 

Modified: grass/trunk/lib/vector/Vlib/close.c
===================================================================
--- grass/trunk/lib/vector/Vlib/close.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/close.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -43,9 +43,13 @@
 #ifdef HAVE_OGR
     , {
     clo_dummy, V1_close_ogr}
+    , {
+    clo_dummy, V1_close_ogr}
 #else
     , {
     clo_dummy, format}
+    , {
+    clo_dummy, format}
 #endif
 };
 

Modified: grass/trunk/lib/vector/Vlib/field.c
===================================================================
--- grass/trunk/lib/vector/Vlib/field.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/field.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -503,7 +503,7 @@
     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"

Modified: grass/trunk/lib/vector/Vlib/open.c
===================================================================
--- grass/trunk/lib/vector/Vlib/open.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/open.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -53,9 +53,13 @@
 #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
 };
 

Modified: grass/trunk/lib/vector/Vlib/read.c
===================================================================
--- grass/trunk/lib/vector/Vlib/read.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/read.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -38,9 +38,13 @@
 #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
 };
 

Modified: grass/trunk/lib/vector/Vlib/rewind.c
===================================================================
--- grass/trunk/lib/vector/Vlib/rewind.c	2009-10-17 15:30:32 UTC (rev 39546)
+++ grass/trunk/lib/vector/Vlib/rewind.c	2009-10-17 16:31:02 UTC (rev 39547)
@@ -41,9 +41,13 @@
 #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
 };