[GRASS-SVN] r66726 - grass/trunk/vector/v.in.ogr

[svn_grass at osgeo.org]

Author: zarch
Date: 2015-11-03 04:53:15 -0800 (Tue, 03 Nov 2015)
New Revision: 66726

Modified:
   grass/trunk/vector/v.in.ogr/main.c
Log:
v.in.ogr: Support int64 for key column too, see #2769

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2015-11-03 10:59:38 UTC (rev 66725)
+++ grass/trunk/vector/v.in.ogr/main.c	2015-11-03 12:53:15 UTC (rev 66726)
@@ -1006,8 +1006,9 @@
                 /* check if the field is integer */
                 Ogr_field = OGR_FD_GetFieldDefn(Ogr_featuredefn, key_idx);
                 Ogr_ftype = OGR_Fld_GetType(Ogr_field);
-                if (Ogr_ftype != OFTInteger)
+                if (!(Ogr_ftype == OFTInteger || Ogr_ftype == OFTInteger64)) {
                     G_fatal_error(_("Key column '%s' is not integer"), param.key->answer);
+                }
                 key_column = G_store(OGR_Fld_GetNameRef(Ogr_field));
             }
         }
@@ -1281,7 +1282,7 @@
 		    }
 		    else {
 			/* G_warning (_("Column value not set" )); */
-			if (Ogr_ftype == OFTInteger || Ogr_ftype == OFTReal) {
+			if (Ogr_ftype == OFTInteger || Ogr_ftype == OFTInteger64 ||Ogr_ftype == OFTReal) {
 			    sprintf(buf, ", NULL");
 			}
 #if GDAL_VERSION_NUM >= 1320