[gnue] r10255 - in trunk/gnue-common: . src/datasources/drivers/Base

[reinhard]

Author: reinhard
Date: 2010-12-02 16:24:56 -0600 (Thu, 02 Dec 2010)
New Revision: 10255

Modified:
   trunk/gnue-common/
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
When moving out of a freshly inserted record, the empty record should be
discarded. Fixed this for cases when the record pointer was moved to "no
record".



Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-11-30 15:23:56.974999905 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

   + timestamp: 2010-12-02 00:52:01.973999977 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

Name: bzr:file-ids
   - src/datasources/drivers/Base/Behavior.py   
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2FBase%2FBehavior.py

   + src/datasources/drivers/Base/ResultSet.py  
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2FBase%2FResultSet.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden

Name: bzr:text-parents
   - src/datasources/drivers/Base/Behavior.py   
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954

   + src/datasources/drivers/Base/ResultSet.py  address@hidden


Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2010-12-02 
20:47:51 UTC (rev 10254)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2010-12-02 
22:24:56 UTC (rev 10255)
@@ -925,24 +925,28 @@
         else:
             self.current = self.__cached_records[self.__current_index]
 
-        # If the current record has *really* changed (this method can be called
-        # for non-changing records after requery or merge) to a new current
-        # record, bring all detail records in sync.
+        # The following lines are only executed if the current record has
+        # *really* changed (this method can be called for non-changing records
+        # after requery or merge) to a new current record.
         if self.current != old_current:
+
+            # If the cursor moved out of an empty record, throw it away.
+            if old_current and old_current.isEmpty():
+                if old_current in self.__cached_records:
+                    index = self.__cached_records.index(old_current)
+                    self.__remove_record(index)
+
+            # Bring all detail records in sync.
             if self.current is not None:
-                if old_current and old_current.isEmpty():
-                    # If the cursor moved out of an empty record, throw it away
-                    if old_current in self.__cached_records:
-                        index = self.__cached_records.index(old_current)
-                        self.__remove_record(index)
                 self.current._activate()
             else:
                 # Pointer moved to "no record": Create empty detail resultsets.
                 for detail_ds in self.__details.keys():
                     detail_ds.clearResultSet()
 
-        if send_event and self.__eventController is not None:
-            self.__eventController.dispatchEvent('dsCursorMoved')
+            # Send event to update UI.
+            if send_event and self.__eventController is not None:
+                self.__eventController.dispatchEvent('dsCursorMoved')
 
 
     # -------------------------------------------------------------------------
@@ -1010,9 +1014,10 @@
         if index <= self.__current_index:
             self.__current_index -= 1
 
-        # ... but don't move below 0 unless there is *really* no record left
-        if self.__current_index < 0 and self.__record_count:
-            self.__current_index = 0
+            # ... but don't move below 0 unless there is *really* no record
+            # left.
+            if self.__current_index < 0 and self.__record_count:
+                self.__current_index = 0
 
 
     # -------------------------------------------------------------------------