[gnue] r7375 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2005-04-15 08:19:46 -0500 (Fri, 15 Apr 2005)
New Revision: 7375

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Some cleanup, partially necessary because the old code accessed ResultSet
internals that are going to change.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-15 12:51:24 UTC (rev 
7374)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2005-04-15 13:19:46 UTC (rev 
7375)
@@ -308,9 +308,6 @@
     # This makes the resultSet call our currentRecordMoved method
     resultSet.registerListener (self)
 
-    # FIXME: Is this used anywhere?
-    resultSet._block = self
-
     # If the ResultSet already has a current record loaded, stay there.
     # Otherwise, jump to the first record. If there is none, create an empty
     # record.
@@ -374,7 +371,7 @@
     if self._resultSet.insertRecord (self._lastValues):
 
       self._recordCount = self._resultSet.getRecordCount()
-      # self.switchRecord(1)            # happens via currentRecordMoved
+
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
       self.processTrigger('ON-NEWRECORD')
@@ -401,7 +398,6 @@
 
       self._resultSet.nextRecord()
       self._recordCount = self._resultSet.getRecordCount()
-      # self.switchRecord(1)            # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -421,8 +417,6 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.lastRecord()
-      # jump = self._resultSet.getRecordNumber () - self._currentRecord
-      # self.switchRecord (jump)        # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -435,7 +429,6 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.firstRecord()
-      # self.switchRecord(0)            # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -449,7 +442,6 @@
       self.processTrigger('POST-FOCUSOUT')
 
       self._resultSet.prevRecord()
-      # self.switchRecord(-1)           # happens via currentRecordMoved
 
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
@@ -460,17 +452,7 @@
           "Please use form.commit () instead."
     self._form.commit ()
 
-    #Commented out (dimas)
-    #Does not work properly anyway
-    #self._form.changeFocus(self)
-    #self._form.commit()
 
-    #TODO: Add error handling
-    #TODO: Check how triggers performed
-    #TODO: original code is in GFForm.commit
-    #self._precommitRecord = self._currentRecord
-    #self.processCommit()
-
   def jumpRecord(self, recordNumber):
     # If recordNumber is negative, move relative to last record
     if recordNumber < 0:
@@ -486,10 +468,6 @@
       if not self._resultSet.setRecord(recordNumber):
         self._resultSet.lastRecord()
 
-      # jump = self._resultSet.getRecordNumber() - self._currentRecord
-      # self._currentRecord = self._resultSet.getRecordNumber()
-      # self.switchRecord(jump)         # happens via currentRecordMoved
-
       # Focus in
       self.processTrigger('PRE-FOCUSIN')
       self.processTrigger('POST-FOCUSIN')
@@ -542,16 +520,17 @@
   # processClear
   #
   def processClear(self):
+
+    # Detail blocks cannot be cleared - they follow their master blindly.
+    if self._dataSourceLink.hasMaster ():
+      return
+
     if self._dataSourceLink._dataObject._connection is not None:
       self._dataSourceLink._dataObject._connection.rollback ()
-    if not self._dataSourceLink.hasMaster():
-      self._dataSourceLink.createEmptyResultSet()
-    else:
-      
self._dataSourceLink.createEmptyResultSet(masterRecordSet=self._resultSet._masterRecordSet)
+
+    self._dataSourceLink.createEmptyResultSet ()
     self._currentRecord = 0
     self._recordCount = 0
-    # FIXME: does this happen via currentRecordMoved?
-    self.switchRecord(0)
 
 
   #
@@ -563,6 +542,10 @@
   #
   def processRollback (self, recovering = False, backendRollback = True):
 
+    # Detail blocks cannot be rolled back - they follow their master blindly.
+    if self._dataSourceLink.hasMaster ():
+      return
+
     # if called from GFForm the connection's rollback () has been executed
     # already. But if called from a trigger code we do it here
     if backendRollback:
@@ -570,20 +553,11 @@
         self._dataSourceLink._dataObject._connection.rollback ()
 
     if not recovering:
+      self._dataSourceLink.createEmptyResultSet ()
       self._currentRecord = 0
-      self._recordCount   = 0
+      self._recordCount = 0
 
-      if not self._dataSourceLink.hasMaster ():
-        self._dataSourceLink.createEmptyResultSet ()
-      else:
-        # if we have a master make sure to keep in touch with it
-        self._dataSourceLink.createEmptyResultSet ( \
-            masterRecordSet = self._resultSet._masterRecordSet)
 
-    # FIXME: does this happen via currentRecordMoved?
-    self.switchRecord (0)
-
-
   #
   # initQuery and processQuery
   #