← Back to branch summary

~ubuntu-branches/ubuntu/precise/grass/precise

« back to all changes in this revision

Viewing changes to gui/wxpython/gui_modules/sqlbuilder.py

  • Committer: Bazaar Package Importer
  • Author(s): Francesco Paolo Lovergine
  • Date: 2011-04-13 17:08:41 UTC
  • mfrom: (8.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110413170841-ss1t9bic0d0uq0gz
Tags: 6.4.1-1
* New upstream version.
* Now build-dep on libjpeg-dev and current libreadline6-dev.
* Removed patch swig: obsolete.
* Policy bumped to 3.9.2, without changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/wxpython/gui_modules/sqlbuilder.py
40
40
 
41
41
import grass.script as grass
42
42
 
43
 
import dbm
44
43
import gcmd
 
44
import dbm_base
45
45
 
46
46
class SQLFrame(wx.Frame):
47
47
    """!SQL Frame class"""
66
66
        
67
67
        # db info
68
68
        self.layer = layer
69
 
        self.dbInfo = dbm.VectorDBInfo(self.vectmap)
 
69
        self.dbInfo = dbm_base.VectorDBInfo(self.vectmap)
70
70
        self.tablename = self.dbInfo.GetTable(self.layer)
71
71
        self.driver, self.database = self.dbInfo.GetDbSettings(self.layer)
72
72
        
183
183
        databasebox = wx.StaticBox(parent = self.panel, id = wx.ID_ANY,
184
184
                                   label = " %s " % _("Database connection"))
185
185
        databaseboxsizer = wx.StaticBoxSizer(databasebox, wx.VERTICAL)
186
 
        databaseboxsizer.Add(item=dbm.createDbInfoDesc(self.panel, self.dbInfo, layer = self.layer),
 
186
        databaseboxsizer.Add(item=dbm_base.createDbInfoDesc(self.panel, self.dbInfo, layer = self.layer),
187
187
                             proportion=1,
188
188
                             flag=wx.EXPAND | wx.ALL,
189
189
                             border=3)
293
293
        
294
294
        querystring = "SELECT %s FROM %s" % (column, self.tablename)
295
295
        
296
 
        cmd = gcmd.Command(['db.select',
297
 
                            '-c',
298
 
                            'table=%s' % self.tablename,
299
 
                            'sql=%s' % querystring,
300
 
                            'database=%s' % self.database,
301
 
                            'driver=%s' % self.driver])
 
296
        data = grass.db_select(table = self.tablename,
 
297
                               sql = querystring,
 
298
                               database = self.database,
 
299
                               driver = self.driver)
302
300
        i = 0
303
 
        for line in cmd.ReadStdOutput():
 
301
        for line in data:
304
302
            if justsample and i < 256 or \
305
303
               not justsample:
306
304
                self.list_values.Append(line.strip())