gnue common/src/dbdrivers/_pgsql/DBdriver.py fo...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/02/26 22:29:56

Modified files:
        common/src/dbdrivers/_pgsql: DBdriver.py 
        forms/src      : GFInstance.py 
        forms/src/uidrivers/wx: UIdriver.py 

Log message:
        fix for single quote
        fix for f2(jump to record) support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.154&tr2=1.155&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.11 
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.12
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.11   Tue Feb 26 18:07:27 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py        Tue Feb 26 22:29:55 2002
***************
*** 51,57 ****
    def __init__(self, pgdriver=None, pgresultset=None):
      DBSIG_DataObject.__init__(self)
      self._connectString = 'host=%s dbname=%s user=%s password=%s'
!     self._escapeSingleQuote = r'\'
      if pgdriver:
        self._pgdriver = pgdriver
        self._DatabaseError = self._pgdriver.DatabaseError
--- 51,57 ----
    def __init__(self, pgdriver=None, pgresultset=None):
      DBSIG_DataObject.__init__(self)
      self._connectString = 'host=%s dbname=%s user=%s password=%s'
!     self._escapeSingleQuote = '\\'
      if pgdriver:
        self._pgdriver = pgdriver
        self._DatabaseError = self._pgdriver.DatabaseError
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.37 gnue/forms/src/GFInstance.py:1.38
*** gnue/forms/src/GFInstance.py:1.37   Wed Feb 20 09:56:46 2002
--- gnue/forms/src/GFInstance.py        Tue Feb 26 22:29:56 2002
***************
*** 305,311 ****
      if not self._form.endEditing():
        return
      count = event.data
!     for jumps in range(abs(count)):
        if count > 0:
          self._form.nextRecord()
        if count < 0:
--- 305,311 ----
      if not self._form.endEditing():
        return
      count = event.data
!     for jumps in range(abs(int(count))):
        if count > 0:
          self._form.nextRecord()
        if count < 0:
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.154 
gnue/forms/src/uidrivers/wx/UIdriver.py:1.155
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.154       Tue Feb 26 19:24:32 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py     Tue Feb 26 22:29:56 2002
***************
*** 47,52 ****
--- 47,53 ----
  _NOTEBOOK = None
  _LOOPTRAP = 0
  _EVENTPROCESSOR = None
+ _PROMPTFORRECORD = None
  _charWidth = 0
  _IdToWxObj = {}
  _IdToGFObj = {}
***************
*** 114,119 ****
--- 115,122 ----
  
      global _EVENTPROCESSOR
      _EVENTPROCESSOR = self.dispatchEvent
+     global _PROMPTFORRECORD    
+     _PROMPTFORRECORD = self.promptForRecordNumber
  
      self.forms = {}
      self.init()
***************
*** 226,232 ****
      dataMenu.Append( 202, "Previous Record   
(Down)",GConfig.get('msg_previous'))
      EVT_MENU(self._wxapp, 202, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestPREVRECORD')))
      dataMenu.Append( 209, "Jump to Record...     
(F2)",GConfig.get('msg_jump'))
!     EVT_MENU(self._wxapp, 209, self.promptForRecordNumber)
      dataMenu.Append( 203, "New Record           
(F12)",GConfig.get('msg_insert'))
      EVT_MENU(self._wxapp, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
      dataMenu.Append( 204, "Delete Record          
(F5)",GConfig.get('msg_delete'))
--- 229,235 ----
      dataMenu.Append( 202, "Previous Record   
(Down)",GConfig.get('msg_previous'))
      EVT_MENU(self._wxapp, 202, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestPREVRECORD')))
      dataMenu.Append( 209, "Jump to Record...     
(F2)",GConfig.get('msg_jump'))
!     EVT_MENU(self._wxapp, 209, _PROMPTFORRECORD)
      dataMenu.Append( 203, "New Record           
(F12)",GConfig.get('msg_insert'))
      EVT_MENU(self._wxapp, 203, lambda event, l=self: 
l.dispatchEvent(GFEvent('requestNEWRECORD')))
      dataMenu.Append( 204, "Delete Record          
(F5)",GConfig.get('msg_delete'))
***************
*** 289,296 ****
      return true
  
    def activateForm(self, form):
!     width = self._form.width
!     height = self._form.height
  
      formSize = wxSize(width*self.widgetWidth,
                        (height+self.menu_sb_space)*self.widgetHeight)
--- 292,299 ----
      return true
  
    def activateForm(self, form):
!     width = int(self._form.width)
!     height = int(self._form.height)
  
      formSize = wxSize(width*self.widgetWidth,
                        (height+self.menu_sb_space)*self.widgetHeight)
***************
*** 949,956 ****
        event.AltDown())
  
      # TODO : Broken for the moment, this should probably be form driven
!     #if command == 'JUMPRECORD':
!     #  self.promptForRecordNumber()
  
      if command:
        action = GFEvent('request%s' % command)
--- 952,960 ----
        event.AltDown())
  
      # TODO : Broken for the moment, this should probably be form driven
!     if command == 'JUMPRECORD':
!       global _PROMPTFORRECORD
!       _PROMPTFORRECORD()
  
      if command:
        action = GFEvent('request%s' % command)