[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7094 - in trunk: gnue-appserver/src gnue-appserver/src/classrep
|
From: |
reinhard |
|
Subject: |
[gnue] r7094 - 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: |
Fri, 4 Mar 2005 17:33:35 -0600 (CST) |
Author: reinhard
Date: 2005-03-04 17:33:34 -0600 (Fri, 04 Mar 2005)
New Revision: 7094
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:
Renamed gBeginFunc and gEndFunc to gEnter and gLeave.
Modified: trunk/gnue-appserver/src/classrep/Base.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Base.py 2005-03-04 23:09:32 UTC (rev
7093)
+++ trunk/gnue-appserver/src/classrep/Base.py 2005-03-04 23:33:34 UTC (rev
7094)
@@ -77,14 +77,14 @@
This function fetches a list of all available items of the dictionaries
table and merges them into the objectlist.
"""
- gBeginFunc (6)
+ gEnter (6)
rlist = self._session.find (self.table, self._getReloadCondition (),
self._getSortorder (),
self._getColumns ())
self.mergeIntoList (rlist, idAsKey)
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# ---------------------------------------------------------------------------
@@ -97,7 +97,7 @@
objectlist. If an object is new in the list, use _getNewItem () to build a
new instance for the object.
"""
- gBeginFunc (6)
+ gEnter (6)
for obj in addList:
found = 0
@@ -116,7 +116,7 @@
key = idAsKey and newItem.gnue_id or newItem.fullName
self [key] = newItem
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# ---------------------------------------------------------------------------
@@ -128,7 +128,7 @@
Descendants override this method to specify a condition for reloading all
elements of the dictionary.
"""
- gEndFunc (6, [])
+ gLeave (6, [])
return []
@@ -141,7 +141,7 @@
Specify a list of fields to be fetched on a reload ().
"""
result = [u'gnue_name']
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -155,7 +155,7 @@
Specify a list of fields used as sort-order.
"""
result = [u'gnue_id']
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -418,14 +418,14 @@
This function replaces all references to @aObject in it's predefined
dictionary.
"""
- gBeginFunc (6)
+ gEnter (6)
for (key, value) in self.__predefined.items ():
if isinstance (value, types.UnicodeType) and value == aObject.objectId:
self.__dict__ [key] = aObject
self.__predefined [key] = aObject
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/classrep/Class.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Class.py 2005-03-04 23:09:32 UTC (rev
7093)
+++ trunk/gnue-appserver/src/classrep/Class.py 2005-03-04 23:33:34 UTC (rev
7094)
@@ -154,7 +154,7 @@
else:
result = []
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -193,7 +193,7 @@
Fields to be fetched on reloads.
"""
result = [u"gnue_module", u"gnue_name", u"gnue_filter"]
- gEndFunc (6, result)
+ gLeave (6, result)
return result
Modified: trunk/gnue-appserver/src/classrep/Parameter.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Parameter.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/classrep/Parameter.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -70,7 +70,7 @@
else:
result = []
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -90,7 +90,7 @@
def _getColumns (self):
result = [u"gnue_procedure", u"gnue_name", u"gnue_type", u"gnue_length",
u"gnue_scale"]
- gEndFunc (6, result)
+ gLeave (6, result)
return (result)
Modified: trunk/gnue-appserver/src/classrep/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Procedure.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/classrep/Procedure.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -80,7 +80,7 @@
else:
result = []
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -103,7 +103,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"]
- gEndFunc (result)
+ gLeave (result)
return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-appserver/src/classrep/Property.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Property.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/classrep/Property.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -89,7 +89,7 @@
result = ['eq', ['field', u'gnue_class'], ['const',
self.__class.gnue_id]]
else:
result = []
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -112,7 +112,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"]
- gEndFunc (6, result)
+ gLeave (6, result)
return result
Modified: trunk/gnue-appserver/src/geasSessionManager.py
===================================================================
--- trunk/gnue-appserver/src/geasSessionManager.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/geasSessionManager.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -237,7 +237,7 @@
def open (self, authentication):
- gBeginFunc (4)
+ gEnter (4)
loginHandler = self._connections._loginHandler
loginOptions = self._connections._loginOptions
@@ -255,7 +255,7 @@
session_id = id (sess)
self._sessions [session_id] = sess
- gEndFunc (4, session_id)
+ gLeave (4, session_id)
return session_id
# ---------------------------------------------------------------------------
@@ -264,7 +264,7 @@
def close (self, session_id, commit):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
if commit:
@@ -272,7 +272,7 @@
s.logout ()
del self._sessions [session_id]
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
# Commit current transaction
@@ -280,12 +280,12 @@
def commit (self, session_id):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
s.commit ()
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
# Rollback current transaction
@@ -293,12 +293,12 @@
def rollback (self, session_id):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
s.rollback ()
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
@@ -308,12 +308,12 @@
def request (self, session_id, classname, conditions, sortorder,
propertylist):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.request (classname, conditions, sortorder, propertylist)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
@@ -323,12 +323,12 @@
def count (self, session_id, list_id):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.count (list_id)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
# ---------------------------------------------------------------------------
@@ -337,11 +337,11 @@
def fetch (self, session_id, list_id, start, count, close = False):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.fetch (list_id, start, count)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
@@ -351,12 +351,12 @@
def load (self, session_id, classname, obj_id_list, propertylist):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.load (classname, obj_id_list, propertylist)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
# ---------------------------------------------------------------------------
@@ -365,12 +365,12 @@
def store (self, session_id, classname, obj_id_list, propertylist, data):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.store (classname, obj_id_list, propertylist, data)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
# ---------------------------------------------------------------------------
@@ -379,12 +379,12 @@
def delete (self, session_id, classname, obj_id_list):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
s.delete (classname, obj_id_list)
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
@@ -394,12 +394,12 @@
def call (self, session_id, classname, obj_id_list, procedurename,
parameters):
- gBeginFunc (4)
+ gEnter (4)
s = self._getSession (session_id)
result = s.call (classname, obj_id_list, procedurename, parameters)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
@@ -409,9 +409,9 @@
def getFilters (self, language):
- gBeginFunc (4)
+ gEnter (4)
result = self._filter.getFilter (language)
- gEndFunc (4, result)
+ gLeave (4, result)
return result
Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2005-03-04 23:09:32 UTC (rev
7093)
+++ trunk/gnue-appserver/src/language/Object.py 2005-03-04 23:33:34 UTC (rev
7094)
@@ -72,14 +72,14 @@
def __getattr__ (self, attr):
- gBeginFunc (6)
+ gEnter (6)
name = self.__session.qualify (attr)
key = name.lower ()
if key == "gnue_id":
result = self.objectId
- gEndFunc (6, result)
+ gLeave (6, result)
return result
sm = self.__session.getSessionManager ()
@@ -115,7 +115,7 @@
else:
result = value
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -126,7 +126,7 @@
def __setattr__ (self, attr, value):
- gBeginFunc (6)
+ gEnter (6)
if self.__dict__.has_key (attr):
self.__dict__ [attr] = value
@@ -161,7 +161,7 @@
sm.store (self.__sid, self.__class, [self.objectId], [name], [[__value]])
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# -------------------------------------------------------------------------
@@ -216,13 +216,13 @@
def delete (self):
- gBeginFunc (6)
+ gEnter (6)
sm = self.__session.getSessionManager ()
sm.delete (self.__sid, self.__class, [self.objectId])
self.objectId = None
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
@@ -258,7 +258,7 @@
@return: self for reference properties, None for non-reference properties.
"""
- gBeginFunc (6)
+ gEnter (6)
name = self.__session.qualify (attr)
key = name.lower ()
@@ -274,7 +274,7 @@
else:
result = None
- gEndFunc (6, result)
+ gLeave (6, result)
return result
Modified: trunk/gnue-appserver/src/language/Procedure.py
===================================================================
--- trunk/gnue-appserver/src/language/Procedure.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/language/Procedure.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -40,12 +40,12 @@
# Delegate calls of this object to the session manager
# ---------------------------------------------------------------------------
def __call__ (self, **params):
- gBeginFunc (6)
+ gEnter (6)
sm = self.__session.getSessionManager ()
sid = self.__session.getSessionId ()
result = sm.call (sid, self.__class, [self.__objectId], self.method,
params) [0]
- gEndFunc (6, result)
+ gLeave (6, result)
return result
Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py 2005-03-04 23:09:32 UTC
(rev 7093)
+++ trunk/gnue-appserver/src/language/Session.py 2005-03-04 23:33:34 UTC
(rev 7094)
@@ -188,13 +188,13 @@
This function closes the encapsulated session on the session manager.
"""
- gBeginFunc (6)
+ gEnter (6)
if self.__sm is not None:
self.__sm.close (self.__session_id, None)
self.__sm = self.__session_id = None
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# -------------------------------------------------------------------------
@@ -206,12 +206,12 @@
This function commits all pending changes of the session.
"""
- gBeginFunc (6)
+ gEnter (6)
if self.__session_id is not None:
self.__sm.commit (self.__session_id)
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# -------------------------------------------------------------------------
@@ -223,12 +223,12 @@
This function revokes all pending changes of the current session.
"""
- gBeginFunc (6)
+ gEnter (6)
if self.__session_id is not None:
self.__sm.rollback (self.__session_id)
- gEndFunc (6, hasResult = False)
+ gLeave (6, hasResult = False)
# -------------------------------------------------------------------------
@@ -254,14 +254,14 @@
@return: ObjectList instance with all matching instances of the given class
"""
- gBeginFunc (6)
+ gEnter (6)
name = self.qualify (classname)
cdef = self.getClassDefinition (name)
result = ObjectList (self, name, conditions, sortorder, properties, cdef)
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -278,11 +278,11 @@
@return: Object instance of the requested class
"""
- gBeginFunc (6)
+ gEnter (6)
result = self._get (classname)
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -303,13 +303,13 @@
@return: Object instance of the requested class
"""
- gBeginFunc (6)
+ gEnter (6)
name = self.qualify (classname)
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -331,7 +331,7 @@
@return: Object instance of the requested class
"""
- gBeginFunc (6)
+ gEnter (6)
name = self.qualify (classname)
self.__sm.load (self.__session_id, name, [objectId], [u'gnue_id'])
@@ -339,7 +339,7 @@
cDef = self.getClassDefinition (name)
result = Object (self, name, objectId, cDef)
- gEndFunc (6, result)
+ gLeave (6, result)
return result
@@ -360,7 +360,7 @@
@return: the message as unicode string
"""
- gBeginFunc (6)
+ gEnter (6)
languages = ['C']
current = self.parameters.get ('_language', 'C')
@@ -392,7 +392,7 @@
else:
text = text % args
- gEndFunc (6, text)
+ gLeave (6, text)
return text
raise MessageNotFoundError, self.qualify (messageName)
Modified: trunk/gnue-common/src/apps/GDebug.py
===================================================================
--- trunk/gnue-common/src/apps/GDebug.py 2005-03-04 23:09:32 UTC (rev
7093)
+++ trunk/gnue-common/src/apps/GDebug.py 2005-03-04 23:33:34 UTC (rev
7094)
@@ -162,7 +162,7 @@
# Add a function-signature to the debug output
# -----------------------------------------------------------------------------
-def gBeginFunc (level = 1):
+def gEnter (level = 1):
"""
This function adds another line to the debug-output, describing the caller's
function with all it's arguments.
@@ -224,7 +224,7 @@
# Add a line to debug-output describing the end of a function call
# -----------------------------------------------------------------------------
-def gEndFunc (level = 1, result = None, hasResult = True):
+def gLeave (level = 1, result = None, hasResult = True):
"""
This function adds a line to the debug-output describing the end of a
function call, optionally containing the function's result.
@@ -277,8 +277,8 @@
-__builtin__.__dict__ ['gBeginFunc'] = gBeginFunc
-__builtin__.__dict__ ['gEndFunc'] = gEndFunc
+__builtin__.__dict__ ['gEnter'] = gEnter
+__builtin__.__dict__ ['gLeave'] = gLeave
class GETrace(Exception):
Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-03-04
23:09:32 UTC (rev 7093)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-03-04
23:33:34 UTC (rev 7094)
@@ -109,9 +109,9 @@
# returns # of records the
def getRecordCount(self):
- gBeginFunc (8)
+ gEnter (8)
result = self._recordCount > 0 and self._recordCount or
self.getCacheCount()
- gEndFunc (8, result)
+ gLeave (8, result)
return result
# Get a specific record (0=based)
Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py 2005-03-04 23:09:32 UTC (rev 7093)
+++ trunk/gnue-forms/src/GFClient.py 2005-03-04 23:33:34 UTC (rev 7094)
@@ -93,7 +93,7 @@
def run (self):
- gBeginFunc (4)
+ gEnter (4)
# Initialize user interface
gDebug (4, "Loading user interface driver")
@@ -187,7 +187,7 @@
gDebug (4, "Closing all connections")
self.getConnectionManager ().closeAll ()
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2005-03-04 23:09:32 UTC (rev 7093)
+++ trunk/gnue-forms/src/GFForm.py 2005-03-04 23:33:34 UTC (rev 7094)
@@ -618,7 +618,7 @@
@return: None if all went well, error message otherwise
"""
- gBeginFunc (4)
+ gEnter (4)
self.endEditing ()
if self.readonly:
@@ -687,7 +687,7 @@
self.findAndChangeFocus (self._currentBlock)
self.dispatchEvent ('endWAIT', _form = self)
- gEndFunc (4, message)
+ gLeave (4, message)
return message
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2005-03-04 23:09:32 UTC (rev 7093)
+++ trunk/gnue-forms/src/GFInstance.py 2005-03-04 23:33:34 UTC (rev 7094)
@@ -76,7 +76,7 @@
# moduleName is here only for Designer to be able to pass it in
#when debugging a form.
- gBeginFunc (4)
+ gEnter (4)
# Configure event handling
gDebug (4, "Initializing event handling")
@@ -168,7 +168,7 @@
parentContainer = self._parentContainer,
moduleName = moduleName)
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
@@ -302,7 +302,7 @@
def activate (self):
- gBeginFunc (4)
+ gEnter (4)
# Initialize all the forms loaded into memory
gDebug (4, "Initializing form objects")
@@ -346,7 +346,7 @@
self._uiinstance.mainLoop ()
gDebug (4, "Returning from main loop")
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
@@ -355,7 +355,7 @@
def activateForm (self, formName = '__main__', parameters = {}, modal = 0):
- gBeginFunc (4)
+ gEnter (4)
form = self._formsDictionary [formName]
@@ -376,7 +376,7 @@
self.dispatchEvent ('gotoENTRY', object = form._currentEntry, _form = form)
self._uiinstance.activateForm (formName, modal)
- gEndFunc (4, hasResult = False)
+ gLeave (4, hasResult = False)
# ---------------------------------------------------------------------------
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7094 - 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,
reinhard <=