[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7104 - in trunk: gnue-appserver/src gnue-appserver/src/classrep
|
From: |
johannes |
|
Subject: |
[gnue] r7104 - in trunk: gnue-appserver/src gnue-appserver/src/classrep gnue-appserver/src/language gnue-common/src/apps gnue-common/src/datasources/drivers/Base gnue-forms/src |
|
Date: |
Mon, 7 Mar 2005 10:49:27 -0600 (CST) |
Author: johannes
Date: 2005-03-07 10:49:25 -0600 (Mon, 07 Mar 2005)
New Revision: 7104
Modified:
trunk/gnue-appserver/src/classrep/Base.py
trunk/gnue-appserver/src/classrep/Class.py
trunk/gnue-appserver/src/classrep/Parameter.py
trunk/gnue-appserver/src/classrep/Procedure.py
trunk/gnue-appserver/src/classrep/Property.py
trunk/gnue-appserver/src/geasSessionManager.py
trunk/gnue-appserver/src/language/Object.py
trunk/gnue-appserver/src/language/Procedure.py
trunk/gnue-appserver/src/language/Session.py
trunk/gnue-common/src/apps/GDebug.py
trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
trunk/gnue-forms/src/GFClient.py
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFInstance.py
Log:
Changed gLeave () to return a result directly
Modified: trunk/gnue-appserver/src/classrep/Base.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Base.py 2005-03-07 14:54:12 UTC (rev
7103)
+++ trunk/gnue-appserver/src/classrep/Base.py 2005-03-07 16:49:25 UTC (rev
7104)
@@ -84,7 +84,7 @@
self._getColumns ())
self.mergeIntoList (rlist, idAsKey)
- gLeave (6, hasResult = False)
+ gLeave (6)
# ---------------------------------------------------------------------------
@@ -116,7 +116,7 @@
key = idAsKey and newItem.gnue_id or newItem.fullName
self [key] = newItem
- gLeave (6, hasResult = False)
+ gLeave (6)
# ---------------------------------------------------------------------------
@@ -128,8 +128,7 @@
Descendants override this method to specify a condition for reloading all
elements of the dictionary.
"""
- gLeave (6, [])
- return []
+ return gLeave (6, [])
# ---------------------------------------------------------------------------
@@ -140,12 +139,9 @@
"""
Specify a list of fields to be fetched on a reload ().
"""
- result = [u'gnue_name']
- gLeave (6, result)
+ return gLeave (6, [u'gnue_name'])
- return result
-
# ---------------------------------------------------------------------------
# Return the sortorder to be used on reload ()
# ---------------------------------------------------------------------------
@@ -154,12 +150,9 @@
"""
Specify a list of fields used as sort-order.
"""
- result = [u'gnue_id']
- gLeave (6, result)
+ return gLeave (6, [u'gnue_id'])
- return result
-
# ---------------------------------------------------------------------------
# Get a condition to fetch a single item for the dictionary
# ---------------------------------------------------------------------------
@@ -425,7 +418,7 @@
self.__dict__ [key] = aObject
self.__predefined [key] = aObject
- gLeave (6, hasResult = False)
+ gLeave (6)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/classrep/Class.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Class.py 2005-03-07 14:54:12 UTC (rev
7103)
+++ trunk/gnue-appserver/src/classrep/Class.py 2005-03-07 16:49:25 UTC (rev
7104)
@@ -154,8 +154,7 @@
else:
result = []
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
@@ -193,8 +192,7 @@
Fields to be fetched on reloads.
"""
result = [u"gnue_module", u"gnue_name", u"gnue_filter"]
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/classrep/Parameter.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Parameter.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/classrep/Parameter.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -66,12 +66,12 @@
def _getReloadCondition (self):
if self.__proc is not None:
- result = ['eq', ['field', u'gnue_procedure'],
['const',self.__proc.gnue_id]]
+ result = ['eq', ['field', u'gnue_procedure'], \
+ ['const',self.__proc.gnue_id]]
else:
result = []
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
@@ -90,8 +90,7 @@
def _getColumns (self):
result = [u"gnue_procedure", u"gnue_name", u"gnue_type", u"gnue_length",
u"gnue_scale"]
- gLeave (6, result)
- return (result)
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/classrep/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Procedure.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/classrep/Procedure.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -80,8 +80,7 @@
else:
result = []
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
@@ -103,8 +102,7 @@
result = [u"gnue_module", u"gnue_class", u"gnue_name", u"gnue_language",
u"gnue_type", u"gnue_length", u"gnue_scale", u"gnue_comment",
u"gnue_nullable"]
- gLeave (result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
# Create a key-not-found exception
Modified: trunk/gnue-appserver/src/classrep/Property.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Property.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/classrep/Property.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -89,8 +89,7 @@
result = ['eq', ['field', u'gnue_class'], ['const',
self.__class.gnue_id]]
else:
result = []
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
@@ -112,8 +111,7 @@
def _getColumns (self):
result = [u"gnue_module", u"gnue_class", u"gnue_name", u"gnue_type",
u"gnue_length", u"gnue_scale", u"gnue_comment", u"gnue_nullable"]
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/geasSessionManager.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -255,8 +255,7 @@
session_id = id (sess)
self._sessions [session_id] = sess
- gLeave (4, session_id)
- return session_id
+ return gLeave (4, session_id)
# ---------------------------------------------------------------------------
# Close the connection
@@ -272,7 +271,7 @@
s.logout ()
del self._sessions [session_id]
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
# Commit current transaction
@@ -285,7 +284,7 @@
s = self._getSession (session_id)
s.commit ()
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
# Rollback current transaction
@@ -298,7 +297,7 @@
s = self._getSession (session_id)
s.rollback ()
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
@@ -313,8 +312,7 @@
s = self._getSession (session_id)
result = s.request (classname, conditions, sortorder, propertylist)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
@@ -328,8 +326,7 @@
s = self._getSession (session_id)
result = s.count (list_id)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
# Fetch objects from list
@@ -341,8 +338,7 @@
s = self._getSession (session_id)
result = s.fetch (list_id, start, count)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
@@ -356,8 +352,7 @@
s = self._getSession (session_id)
result = s.load (classname, obj_id_list, propertylist)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
# Store objects
@@ -370,8 +365,7 @@
s = self._getSession (session_id)
result = s.store (classname, obj_id_list, propertylist, data)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
# Delete objects
@@ -384,7 +378,7 @@
s = self._getSession (session_id)
s.delete (classname, obj_id_list)
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
@@ -399,8 +393,7 @@
s = self._getSession (session_id)
result = s.call (classname, obj_id_list, procedurename, parameters)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
# ---------------------------------------------------------------------------
@@ -413,5 +406,4 @@
result = self._filter.getFilter (language)
- gLeave (4, result)
- return result
+ return gLeave (4, result)
Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2005-03-07 14:54:12 UTC (rev
7103)
+++ trunk/gnue-appserver/src/language/Object.py 2005-03-07 16:49:25 UTC (rev
7104)
@@ -79,8 +79,7 @@
if key == "gnue_id":
result = self.objectId
- gLeave (6, result)
- return result
+ return gLeave (6, result)
sm = self.__session.getSessionManager ()
@@ -115,11 +114,9 @@
else:
result = value
- gLeave (6, result)
+ return gLeave (6, result)
- return result
-
# -------------------------------------------------------------------------
# Set an attribute's value
# -------------------------------------------------------------------------
@@ -161,7 +158,7 @@
sm.store (self.__sid, self.__class, [self.objectId], [name], [[__value]])
- gLeave (6, hasResult = False)
+ gLeave (6)
# -------------------------------------------------------------------------
@@ -222,7 +219,7 @@
sm.delete (self.__sid, self.__class, [self.objectId])
self.objectId = None
- gLeave (6, hasResult = False)
+ gLeave (6)
@@ -274,8 +271,7 @@
else:
result = None
- gLeave (6, result)
- return result
+ return gLeave (6, result)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/language/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/language/Procedure.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/language/Procedure.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -47,5 +47,4 @@
result = sm.call (sid, self.__class, [self.__objectId], self.method,
params) [0]
- gLeave (6, result)
- return result
+ return gLeave (6, result)
Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py 2005-03-07 14:54:12 UTC
(rev 7103)
+++ trunk/gnue-appserver/src/language/Session.py 2005-03-07 16:49:25 UTC
(rev 7104)
@@ -194,7 +194,7 @@
self.__sm.close (self.__session_id, None)
self.__sm = self.__session_id = None
- gLeave (6, hasResult = False)
+ gLeave (6)
# -------------------------------------------------------------------------
@@ -211,7 +211,7 @@
if self.__session_id is not None:
self.__sm.commit (self.__session_id)
- gLeave (6, hasResult = False)
+ gLeave (6)
# -------------------------------------------------------------------------
@@ -228,7 +228,7 @@
if self.__session_id is not None:
self.__sm.rollback (self.__session_id)
- gLeave (6, hasResult = False)
+ gLeave (6)
# -------------------------------------------------------------------------
@@ -261,11 +261,9 @@
result = ObjectList (self, name, conditions, sortorder, properties, cdef)
- gLeave (6, result)
+ return gLeave (6, result)
- return result
-
# -------------------------------------------------------------------------
# Create a new instance of classname
# -------------------------------------------------------------------------
@@ -282,11 +280,9 @@
result = self._get (classname)
- gLeave (6, result)
+ return gLeave (6, result)
- return result
-
# ---------------------------------------------------------------------------
# Get an instance of a class with a given object Id
# ---------------------------------------------------------------------------
@@ -309,11 +305,9 @@
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- gLeave (6, result)
+ return gLeave (6, result)
- return result
-
# -------------------------------------------------------------------------
# Get an instance of a class having a given objectId
# -------------------------------------------------------------------------
@@ -339,11 +333,9 @@
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- gLeave (6, result)
+ return gLeave (6, result)
- return result
-
# -------------------------------------------------------------------------
# Get a message from the message catalogue
# -------------------------------------------------------------------------
@@ -392,8 +384,7 @@
else:
text = text % args
- gLeave (6, text)
- return text
+ return gLeave (6, text)
raise MessageNotFoundError, self.qualify (messageName)
Modified: trunk/gnue-common/src/apps/GDebug.py
===================================================================
--- trunk/gnue-common/src/apps/GDebug.py 2005-03-07 14:54:12 UTC (rev
7103)
+++ trunk/gnue-common/src/apps/GDebug.py 2005-03-07 16:49:25 UTC (rev
7104)
@@ -224,20 +224,23 @@
# Add a line to debug-output describing the end of a function call
# -----------------------------------------------------------------------------
-def gLeave (level = 1, result = None, hasResult = True):
+def gLeave (level = 1, *result):
"""
This function adds a line to the debug-output describing the end of a
function call, optionally containing the function's result.
@param level: debug-level to send the message to
- @param result: the function's result or None
- @param hasResult: if set to True, the debug-message will contain the
- function's result (even if it's None). If set to False the result won't
- be in the debug-message, unless the result is not None.
+ @param result: the function's result (if any)
"""
+ # We cannot use something like 'retVal = len (result) and result [0] or None'
+ # here, cause this won't work for 'empty' results like [] or {}.
+ retVal = None
+ if len (result):
+ retVal = result [0]
+
if not level in _DEBUG_LEVELS:
- return
+ return retVal
# Get the caller's frame
frame = sys._getframe (1)
@@ -253,12 +256,9 @@
fName = "%s.%s" % (flocals ['self'].__class__, fName)
hId = repr (hex (id (flocals ['self'])))
- # Override the output-flag if there's a result value given.
- pr = hasResult or result is not None
+ resStr = len (result) and ' == %s' % repr (retVal) or ''
+ message = "Leaving function %s (%s)%s" % (fName, hId, resStr)
- message = "Leaving function %s (%s)%s" % (fName, hId,
- pr and ' == %s' % repr (result) or '')
-
path = frame.f_code.co_filename
if path [-3:] == '.py':
path = string.split (path [:-3], '/') [-1]
@@ -273,6 +273,7 @@
# Make sure to release the reference to the frame object. This keeps
# garbage collection doing a fine job :)
del frame
+ return retVal
Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-03-07
14:54:12 UTC (rev 7103)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-03-07
16:49:25 UTC (rev 7104)
@@ -111,8 +111,7 @@
def getRecordCount(self):
gEnter (8)
result = self._recordCount > 0 and self._recordCount or
self.getCacheCount()
- gLeave (8, result)
- return result
+ return gLeave (8, result)
# Get a specific record (0=based)
def getRecord(self, record):
Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py 2005-03-07 14:54:12 UTC (rev 7103)
+++ trunk/gnue-forms/src/GFClient.py 2005-03-07 16:49:25 UTC (rev 7104)
@@ -187,7 +187,7 @@
gDebug (4, "Closing all connections")
self.getConnectionManager ().closeAll ()
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-03-07 14:54:12 UTC (rev 7103)
+++ trunk/gnue-forms/src/GFForm.py 2005-03-07 16:49:25 UTC (rev 7104)
@@ -687,7 +687,7 @@
self.findAndChangeFocus (self._currentBlock)
self.dispatchEvent ('endWAIT', _form = self)
- gLeave (4, message)
+ gLeave (4)
return message
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-03-07 14:54:12 UTC (rev 7103)
+++ trunk/gnue-forms/src/GFInstance.py 2005-03-07 16:49:25 UTC (rev 7104)
@@ -168,7 +168,7 @@
parentContainer = self._parentContainer,
moduleName = moduleName)
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
@@ -346,7 +346,7 @@
self._uiinstance.mainLoop ()
gDebug (4, "Returning from main loop")
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
@@ -376,7 +376,7 @@
self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
self._uiinstance.activateForm (formName, modal)
- gLeave (4, hasResult = False)
+ gLeave (4)
# ---------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7104 - in trunk: gnue-appserver/src gnue-appserver/src/classrep gnue-appserver/src/language gnue-common/src/apps gnue-common/src/datasources/drivers/Base gnue-forms/src,
johannes <=