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
1060@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py
+ src/datasources/GConnections.py
1060@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2FGConnections.py
src/datasources/GDataSource.py
1098@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2FGDataSource.py
src/datasources/drivers/Base/ResultSet.py
4887@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2FBase%2FResultSet.py
Name: bzr:revision-id:v4
- 3116 [email protected]
3117 [email protected]
3118 [email protected]
3119 [email protected]
3120 [email protected]
3121 [email protected]
3122 [email protected]
3123 [email protected]
3124 [email protected]
3125 [email protected]
3126 [email protected]
3127 [email protected]
3128 [email protected]
3129 [email protected]
3130 [email protected]
3131 [email protected]
3132 [email protected]
3133 [email protected]
3134 [email protected]
3135 [email protected]
3136 [email protected]
3137 [email protected]
3138 [email protected]
3139 [email protected]
3140 [email protected]
3141 [email protected]
3142 [email protected]
3143 [email protected]
3144 [email protected]
3145 [email protected]
3146 [email protected]
3147 [email protected]
3148 [email protected]
3149 [email protected]
3150 [email protected]
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
+ 3116 [email protected]
3117 [email protected]
3118 [email protected]
3119 [email protected]
3120 [email protected]
3121 [email protected]
3122 [email protected]
3123 [email protected]
3124 [email protected]
3125 [email protected]
3126 [email protected]
3127 [email protected]
3128 [email protected]
3129 [email protected]
3130 [email protected]
3131 [email protected]
3132 [email protected]
3133 [email protected]
3134 [email protected]
3135 [email protected]
3136 [email protected]
3137 [email protected]
3138 [email protected]
3139 [email protected]
3140 [email protected]
3141 [email protected]
3142 [email protected]
3143 [email protected]
3144 [email protected]
3145 [email protected]
3146 [email protected]
3147 [email protected]
3148 [email protected]
3149 [email protected]
3150 [email protected]
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5
Name: bzr:text-parents
- src/datasources/GConnections.py
[email protected]
+ src/datasources/GConnections.py
whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
[email protected]
src/datasources/GDataSource.py
[email protected]
src/datasources/drivers/Base/ResultSet.py
[email protected]
Name: bzr:ancestry:v4
+ [email protected]
Name: bzr:text-revisions
+ src/datasources/GDataSource.py
[email protected]
src/datasources/drivers/Base/ResultSet.py
[email protected]
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
# -------------------------------------------------------------------------
_______________________________________________
commit-gnue mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnue
