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

[reinhard]

Author: reinhard
Date: 2011-02-17 02:05:56 -0600 (Thu, 17 Feb 2011)
New Revision: 10293

Modified:
   trunk/gnue-common/
   trunk/gnue-common/src/datasources/GConnections.py
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Merged from savannah



Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2011-01-31 12:08:39.948999882 -0800
committer: Whizman Software Solutions <www.whizman.com>
properties: 
        branch-nick: common

   + timestamp: 2011-02-16 18:03:17.683000088 -0800
committer: whizman.com
properties: 
        branch-nick: common

Name: bzr:file-ids
   - src/datasources/GConnections.py    
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py

   + src/datasources/GConnections.py    
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py
src/datasources/GDataSource.py  
address@hidden:trunk%2Fgnue-common:src%2Fdatasources%2FGDataSource.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
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c

   + 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
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5

Name: bzr:text-parents
   - src/datasources/GConnections.py    address@hidden

   + src/datasources/GConnections.py    
whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c      
address@hidden
src/datasources/GDataSource.py  address@hidden
src/datasources/drivers/Base/ResultSet.py       address@hidden

Name: bzr:ancestry:v4
   + address@hidden

Name: bzr:text-revisions
   + src/datasources/GDataSource.py     address@hidden
src/datasources/drivers/Base/ResultSet.py       address@hidden

Name: svn:mergeinfo
   + /trunk/gnue-common:10283,10286-10287

Name: svk:merge
   + 3a364389-8fce-0310-8f11-cc363fde16c7:/trunk/gnue-common:10287


Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================

Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2011-02-17 08:05:51 UTC 
(rev 10292)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2011-02-17 08:05:56 UTC 
(rev 10293)
@@ -825,11 +825,11 @@
     if self.__master:
       self.__master.requeryAll (commit)
     else:
-      self.__currentResultSet.requery (commit)
-      # Many records can have changed through backend triggers. The UI has to
-      # follow the changes.
-      self.__eventController.dispatchEvent ('dsResultSetChanged',
-          resultSet = self.__currentResultSet)
+      if self.__currentResultSet.requery (commit):
+        # Many records can have changed through backend triggers. The UI has to
+        # follow the changes.
+        self.__eventController.dispatchEvent ('dsResultSetChanged',
+            resultSet = self.__currentResultSet)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2011-02-17 
08:05:51 UTC (rev 10292)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2011-02-17 
08:05:56 UTC (rev 10293)
@@ -296,7 +296,7 @@
             depends on the backend.
         """
 
-        checktype(record, int)
+        checktype(record, (int, long))
 
         while (record + 1 > len(self.__cached_records)) \
                 and self.__cache_next_record():
@@ -479,7 +479,7 @@
             fetching it from the backend fails. The exact exception class
             depends on the backend.
         """
-        checktype(record, int)
+        checktype(record, (int, long))
 
         while (record > len(self.__cached_records) - 1) \
                 and self.__cache_next_record():
@@ -764,10 +764,13 @@
         @param commit: indicate whether a commit was run since the last L{post}
             call.
 
+        @return: True if something has changed at all, False otherwise.
+
         @raise Exception: if querying the records from the backend fails for
             any reason. The exact exception classes depend on the backend.
         """
 
+        any_change = False
         index = 0
         while index < len(self.__cached_records):
             record = self.__cached_records[index]
@@ -779,12 +782,16 @@
                 else:
                     record._requery(commit)
                     index += 1
+                any_change = True
             else:
                 index += 1
 
-        self.__sync(False)
+        if any_change:
+            self.__sync(False)
 
+        return any_change
 
+
     # -------------------------------------------------------------------------
     # Merge another ResultSet into this one
     # -------------------------------------------------------------------------