[GRASS-SVN] r43545 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-09-20 21:13:51 +0000 (Mon, 20 Sep 2010)
New Revision: 43545

Modified:
   grass/trunk/gui/wxpython/gui_modules/gdialogs.py
   grass/trunk/gui/wxpython/gui_modules/render.py
Log:
wxGUI: fix bulk import (dir)
(merge r43544 from devbr6)


Modified: grass/trunk/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2010-09-20 21:11:19 UTC (rev 43544)
+++ grass/trunk/gui/wxpython/gui_modules/gdialogs.py	2010-09-20 21:13:51 UTC (rev 43545)
@@ -1147,15 +1147,15 @@
                            'output=%s' % output]
             else: # gdal
                 if self.dsnInput.GetType() == 'dir':
-                    dsn = os.path.join(dsn, layer)
+                    idsn = os.path.join(dsn, layer)
                 
                 if self.link:
                     cmd = ['r.external',
-                           'input=%s' % dsn,
+                           'input=%s' % idsn,
                            'output=%s' % output]
                 else:
                     cmd = ['r.in.gdal',
-                           'input=%s' % dsn,
+                           'input=%s' % idsn,
                            'output=%s' % output]
             
             if self.overwrite.IsChecked():

Modified: grass/trunk/gui/wxpython/gui_modules/render.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/render.py	2010-09-20 21:11:19 UTC (rev 43544)
+++ grass/trunk/gui/wxpython/gui_modules/render.py	2010-09-20 21:13:51 UTC (rev 43545)
@@ -613,11 +613,9 @@
                               **cmd)
         if not ret:
             if rast:
-                message = _("Unable to zoom to raster map <%s>.") % rast[0] + \
-                    '%s%s' % (os.linesep, os.linesep) + e.message
+                message = _("Unable to zoom to raster map <%s>.") % rast[0]
             elif vect:
-                message = _("Unable to zoom to vector map <%s>.") % vect[0] + \
-                    '%s%s' % (os.linesep, os.linesep) + e.message
+                message = _("Unable to zoom to vector map <%s>.") % vect[0]
             else:
                 message = _("Unable to get current geographic extent. "
                             "Force quiting wxGUI. Please run manually g.region to "