gnue/forms/src GFForm.py GFInstance.py GFObject...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/04/03 21:10:34

Modified files:
        forms/src      : GFForm.py GFInstance.py 
        forms/src/GFObjects: GFEntry.py 

Log message:
        fixed bugs introduced by record-level triggers (duplication of existing 
variable causing 'int' errors; pre-commit being fired twice for current record)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFForm.py.diff?cvsroot=OldCVS&tr1=1.160&tr2=1.161&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFInstance.py.diff?cvsroot=OldCVS&tr1=1.42&tr2=1.43&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/forms/src/GFObjects/GFEntry.py.diff?cvsroot=OldCVS&tr1=1.49&tr2=1.50&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.160 gnue/forms/src/GFForm.py:1.161
*** gnue/forms/src/GFForm.py:1.160      Tue Apr  2 22:46:58 2002
--- gnue/forms/src/GFForm.py    Wed Apr  3 21:10:34 2002
***************
*** 453,459 ****
              # This gets lost in the Pre-Commit code
              block._precommitRecord = block._currentRecord
  
!             block.processTrigger('Pre-Commit')
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
--- 453,463 ----
              # This gets lost in the Pre-Commit code
              block._precommitRecord = block._currentRecord
  
!             # TODO: Need to check with jamest..
!             # Now, block-level pre-commits get called for
!             # EACH record via another hook in GFDataSource
!             ##block.processTrigger('Pre-Commit')
! 
              block.processCommit()
            except TriggerError:
              GDebug.printMesg(1, "Trigger block Pre-Commit threw a 
TriggerError!")
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.42 gnue/forms/src/GFInstance.py:1.43
*** gnue/forms/src/GFInstance.py:1.42   Wed Apr  3 01:37:07 2002
--- gnue/forms/src/GFInstance.py        Wed Apr  3 21:10:34 2002
***************
*** 559,565 ****
        return
  
      saveMode = block.mode
!     block._precommitRecord = event.record
      block.mode = 'precommit'
      block.processTrigger(trigger)
      block.mode = saveMode
--- 559,565 ----
        return
  
      saveMode = block.mode
!     block._preCommitWorkingRecord = event.record
      block.mode = 'precommit'
      block.processTrigger(trigger)
      block.mode = saveMode
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.49 
gnue/forms/src/GFObjects/GFEntry.py:1.50
*** gnue/forms/src/GFObjects/GFEntry.py:1.49    Wed Apr  3 01:18:06 2002
--- gnue/forms/src/GFObjects/GFEntry.py Wed Apr  3 21:10:34 2002
***************
*** 192,198 ****
            value = None
  
        elif self._block.mode == 'precommit':
!         value = self._block._precommitRecord.getField(self.field)
  
        else:
          value = self._block._resultSet.current.getField(self.field)
--- 192,198 ----
            value = None
  
        elif self._block.mode == 'precommit':
!         value = self._block._preCommitWorkingRecord.getField(self.field)
  
        else:
          value = self._block._resultSet.current.getField(self.field)
***************
*** 220,226 ****
        self._block._queryValues[self] = value
  
      elif self._block.mode == 'precommit':
!       value = self._block._precommitRecord.setField(self.field,value)
  
      else:
        self._block._resultSet.current.setField(self.field,value)
--- 220,226 ----
        self._block._queryValues[self] = value
  
      elif self._block.mode == 'precommit':
!       value = self._block._preCommitWorkingRecord.setField(self.field,value)
  
      else:
        self._block._resultSet.current.setField(self.field,value)