wxGUI: update for renamed dsn parameter (trunk, https://trac.osgeo.org/grass/changeset/63330)

git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63331 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gis_set.py

@@ -513,14 +513,14 @@ class GRASSStartup(wx.Frame):
         """
         RunCommand('db.connect', flags='c')
         mapName = os.path.splitext(os.path.basename(filePath))[0]
-        vectors = RunCommand('v.in.ogr', dsn = filePath, flags = 'l',
+        vectors = RunCommand('v.in.ogr', input = filePath, flags = 'l',
                              read = True)
         
         wx.BeginBusyCursor()
         wx.Yield()
         if mapName in vectors:
             # vector detected
-            returncode, error = RunCommand('v.in.ogr', dsn = filePath, output = mapName,
+            returncode, error = RunCommand('v.in.ogr', input = filePath, output = mapName,
                                            getErrorMsg = True)
         else:
             returncode, error = RunCommand('r.in.gdal', input = filePath, output = mapName,

gui/wxpython/gui_core/dialogs.py

@@ -412,7 +412,7 @@ def CreateNewVector(parent, cmd, title = _('Create new vector map'),
                                    parent = parent,
                                    read = True,
                                    flags = 'l',
-                                   dsn = vExternalOut['dsn']).splitlines()
+                                   input = vExternalOut['dsn']).splitlines()
     
     overwrite = False
     if not UserSettings.Get(group = 'cmd', key = 'overwrite', subkey = 'enabled') and \
@@ -446,7 +446,7 @@ def CreateNewVector(parent, cmd, title = _('Create new vector map'),
         RunCommand('v.external',
                    overwrite = overwrite,
                    parent = parent,
-                   dsn = vExternalOut['dsn'],
+                   input = vExternalOut['dsn'],
                    layer = outmap)
         
     # create attribute table
@@ -1891,12 +1891,12 @@ class GdalImportDialog(ImportDialog):
                     layer = layer.replace('.' + ext, '')
                 if self.link:
                     cmd = ['v.external',
-                           'dsn=%s' % dsn,
+                           'input=%s' % dsn,
                            'output=%s' % output,
                            'layer=%s' % layer]
                 else:
                     cmd = ['v.in.ogr',
-                           'dsn=%s' % dsn,
+                           'input=%s' % dsn,
                            'layer=%s' % layer,
                            'output=%s' % output]
             else: # gdal
@@ -2041,7 +2041,7 @@ class GdalOutputDialog(wx.Dialog):
             
             RunCommand('v.external.out',
                        parent = self,
-                       dsn = dsn, format = frmt,
+                       output = dsn, format = frmt,
                        options = options)
         self.Close()
         

gui/wxpython/gui_core/gselect.py

@@ -861,7 +861,7 @@ class LayerSelect(wx.ComboBox):
                              read = True,
                              quiet = True,
                              flags = 'l',
-                             dsn = dsn)
+                             input = dsn)
             if ret:
                 layers = ret.splitlines()
 
@@ -1921,7 +1921,7 @@ class GdalSelect(wx.Panel):
                              quiet = True,
                              read = True,
                              flags = 't',
-                             dsn = dsn)
+                             input = dsn)
             if not ret:
                 self.reloadDataRequired.emit(data=None)
                 return