[GRASS-SVN] r65751 - in grass/trunk: gui/wxpython/modules scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-07-21 04:12:19 -0700 (Tue, 21 Jul 2015)
New Revision: 65751

Modified:
   grass/trunk/gui/wxpython/modules/import_export.py
   grass/trunk/scripts/Makefile
Log:
wxGUI: use v.import instead of v.in.ogr
       enable v.import


Modified: grass/trunk/gui/wxpython/modules/import_export.py
===================================================================
--- grass/trunk/gui/wxpython/modules/import_export.py	2015-07-21 10:46:54 UTC (rev 65750)
+++ grass/trunk/gui/wxpython/modules/import_export.py	2015-07-21 11:12:19 UTC (rev 65751)
@@ -87,7 +87,7 @@
                 continue
             elif cmd == 'r.external' and name not in ('o', 'e', 'r', 'h', 'v'):
                 continue
-            elif cmd == 'v.in.ogr' and name not in ('c', 'z', 't', 'o', 'r', 'e', 'w'):
+            elif cmd == 'v.import':
                 continue
             elif cmd == 'v.external' and name not in ('b'):
                 continue
@@ -103,7 +103,7 @@
                 desc = p.get('description', '')
             if not name and not desc:
                 continue
-            if cmd == 'v.in.ogr' and name == 'encoding':
+            if cmd == 'v.import' and name == 'encoding':
                 self.options_par[name] = (_('Encoding'),
                                           wx.TextCtrl(parent = self.panel, id = wx.ID_ANY))
         
@@ -375,7 +375,7 @@
                            'output=%s' % output,
                            'layer=%s' % layer]
                 else:
-                    cmd = ['v.in.ogr',
+                    cmd = ['v.import',
                            'input=%s' % dsn,
                            'layer=%s' % layer,
                            'output=%s' % output]
@@ -454,7 +454,7 @@
                 return 'r.external'
         else:
             if self.ogr:
-                return 'v.in.ogr'
+                return 'v.import'
             else:
                 return 'r.in.gdal'
         

Modified: grass/trunk/scripts/Makefile
===================================================================
--- grass/trunk/scripts/Makefile	2015-07-21 10:46:54 UTC (rev 65750)
+++ grass/trunk/scripts/Makefile	2015-07-21 11:12:19 UTC (rev 65751)
@@ -60,6 +60,7 @@
 	v.db.univar \
 	v.db.update \
 	v.dissolve \
+	v.import \
 	v.in.e00 \
 	v.in.geonames \
 	v.in.lines \