[GRASS-SVN] r51399 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-04-12 10:20:04 -0700 (Thu, 12 Apr 2012)
New Revision: 51399

Modified:
   grass/trunk/gui/wxpython/gui_core/dialogs.py
   grass/trunk/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: fix linking PostGIS data (v.external: 'p' flag removed)


Modified: grass/trunk/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/dialogs.py	2012-04-12 16:56:04 UTC (rev 51398)
+++ grass/trunk/gui/wxpython/gui_core/dialogs.py	2012-04-12 17:20:04 UTC (rev 51399)
@@ -1759,7 +1759,7 @@
         self.commandId = -1
         data = self.list.GetLayers()
         
-        dsn, flags = self.dsnInput.GetDsn(flags = True)
+        dsn = self.dsnInput.GetDsn()
         ext = self.dsnInput.GetFormatExt()
         for layer, output in data:
             if self.importType == 'ogr':
@@ -1797,9 +1797,6 @@
                 if self.options[key].IsChecked():
                     cmd.append('-%s' % key)
             
-            for f in flags:
-                cmd.append('-%s' % f)
-            
             if UserSettings.Get(group = 'cmd', key = 'overwrite', subkey = 'enabled'):
                 cmd.append('--overwrite')
             

Modified: grass/trunk/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/gselect.py	2012-04-12 16:56:04 UTC (rev 51398)
+++ grass/trunk/gui/wxpython/gui_core/gselect.py	2012-04-12 17:20:04 UTC (rev 51399)
@@ -1552,22 +1552,14 @@
         
         self.dsnSizer.Layout()
         
-    def GetDsn(self, flags = False):
+    def GetDsn(self):
         """!Get datasource name
-
-        @param flags True to get tuple (dsn, flags)
         """
-        flgs = []
         if self.format.GetStringSelection() == 'PostgreSQL':
-            if self.source.GetSelection() == self.sourceMap['db-pg']:
-                flgs.append('p')
             dsn = 'PG:dbname=%s' % self.input[self.dsnType][1].GetStringSelection()
         else:
             dsn = self.input[self.dsnType][1].GetValue()
         
-        if flags:
-            return (dsn, flgs)
-        
         return dsn
     
     def OnSetDsn(self, event, path = None):