r5043 - in trunk/gnue-appserver/src: . classrep language

[johannes]

Author: johannes
Date: 2004-01-27 09:05:42 -0600 (Tue, 27 Jan 2004)
New Revision: 5043

Modified:
   trunk/gnue-appserver/src/__init__.py
   trunk/gnue-appserver/src/classrep/Base.py
   trunk/gnue-appserver/src/classrep/Class.py
   trunk/gnue-appserver/src/classrep/Definition.py
   trunk/gnue-appserver/src/classrep/Module.py
   trunk/gnue-appserver/src/classrep/Namespace.py
   trunk/gnue-appserver/src/classrep/Procedure.py
   trunk/gnue-appserver/src/classrep/Property.py
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
   trunk/gnue-appserver/src/classrep/__init__.py
   trunk/gnue-appserver/src/classrep/crpopulate.py
   trunk/gnue-appserver/src/classrep/dtest.py
   trunk/gnue-appserver/src/classrep/mtest.py
   trunk/gnue-appserver/src/classrep/test.py
   trunk/gnue-appserver/src/frontend.py
   trunk/gnue-appserver/src/geasAuthentication.py
   trunk/gnue-appserver/src/geasBClass.py
   trunk/gnue-appserver/src/geasConfiguration.py
   trunk/gnue-appserver/src/geasInstance.py
   trunk/gnue-appserver/src/geasList.py
   trunk/gnue-appserver/src/geasRpcServer.py
   trunk/gnue-appserver/src/geasSession.py
   trunk/gnue-appserver/src/geasSessionManager.py
   trunk/gnue-appserver/src/geasTrigger.py
   trunk/gnue-appserver/src/language/App.py
   trunk/gnue-appserver/src/language/Object.py
   trunk/gnue-appserver/src/language/ObjectList.py
   trunk/gnue-appserver/src/language/Session.py
   trunk/gnue-appserver/src/language/test.py
   trunk/gnue-appserver/src/test.py
   trunk/gnue-appserver/src/testRPC.py
Log:
Added procedures to the language interface and set the Id-keyword-property for 
all sourcefiles.



Property changes on: trunk/gnue-appserver/src/__init__.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Base.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Class.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Definition.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Module.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Namespace.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Procedure.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/Property.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/SchemaSupport.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/__init__.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/crpopulate.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/dtest.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/mtest.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/classrep/test.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/frontend.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasAuthentication.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasBClass.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasConfiguration.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-appserver/src/geasInstance.py
===================================================================
--- trunk/gnue-appserver/src/geasInstance.py    2004-01-27 09:44:15 UTC (rev 
5042)
+++ trunk/gnue-appserver/src/geasInstance.py    2004-01-27 15:05:42 UTC (rev 
5043)
@@ -19,7 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: geasInstance.py,v 1.33 2003/11/08 18:43:28 siesel Exp $
+# $Id$
 
 import types
 import mx.DateTime
@@ -268,9 +268,9 @@
     from gnue.appserver.language import Object
 
     # Create an object representing the current business object
-    obj = Object.newObject (self._session.sm, self._session.id,
-                            self._classdef.fullName,
-                            {"gnue_id": self._getValue ("gnue_id")})
+    obj = Object.Object (self._session.sm, self._session.id,
+                         self._classdef.fullName,
+                         {"gnue_id": self._getValue ("gnue_id")})
 
     # Compile the procedure code
     proceduredef = self._classdef.procedures [procedurename]


Property changes on: trunk/gnue-appserver/src/geasInstance.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasList.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasRpcServer.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasSession.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasSessionManager.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/geasTrigger.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-appserver/src/language/App.py
===================================================================
--- trunk/gnue-appserver/src/language/App.py    2004-01-27 09:44:15 UTC (rev 
5042)
+++ trunk/gnue-appserver/src/language/App.py    2004-01-27 15:05:42 UTC (rev 
5043)
@@ -19,7 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: App.py,v 1.1 2003/07/28 22:47:25 reinhard Exp $
+# $Id$
 
 from gnue.common.apps import GClientApp
 from gnue.common.datasources import GLoginHandler
@@ -43,7 +43,7 @@
     self._sm = geasSessionManager.geasSessionManager (self.connections)
 
   def newSession (self, username, password):
-    return Session.Session (self._sm, username, password)
+    return Session.LoginSession (self._sm, username, password)
 
 # =============================================================================
 # Login Handler

Modified: trunk/gnue-appserver/src/language/Object.py
===================================================================
--- trunk/gnue-appserver/src/language/Object.py 2004-01-27 09:44:15 UTC (rev 
5042)
+++ trunk/gnue-appserver/src/language/Object.py 2004-01-27 15:05:42 UTC (rev 
5043)
@@ -19,16 +19,14 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: Object.py,v 1.10 2003/10/21 07:25:44 reinhard Exp $
+# $Id$
 
 import sys
 import types
 import mx.DateTime
 import mx.DateTime.ISO
+from Procedure import Procedure
 
-def newObject (server, sessionId, classname, objData=None):
-  return Object (server, sessionId, classname, objData)
-
 # ===========================================================================
 # Helper methods
 # ===========================================================================
@@ -80,6 +78,9 @@
         else:
           res = self._server.load (self._session_id, self._class, [''], [attr])
           self._cache [attr] = self.rpc_to_native (None, res [0] [0])
+      elif self._attrIsMethod (attr):
+        return Procedure (self._server, self._session_id, self.objectId,
+            self._class, attr)
       else:
         raise AttributeError, attr
 
@@ -112,6 +113,11 @@
   def _attrIsValid (self, attr):
     return self._server.classes [self._class].properties.has_key (attr)
 
+  # -------------------------------------------------------------------------
+  # Check if 'attr' is a valid procedure of this class
+  # -------------------------------------------------------------------------
+  def _attrIsMethod (self, attr):
+    return self._server.classes [self._class].procedures.has_key (attr)
 
   # -------------------------------------------------------------------------
   # Get an apropriate default value for type

Modified: trunk/gnue-appserver/src/language/ObjectList.py
===================================================================
--- trunk/gnue-appserver/src/language/ObjectList.py     2004-01-27 09:44:15 UTC 
(rev 5042)
+++ trunk/gnue-appserver/src/language/ObjectList.py     2004-01-27 15:05:42 UTC 
(rev 5043)
@@ -19,16 +19,13 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: ObjectList.py,v 1.7 2003/10/19 17:55:56 reinhard Exp $
+# $Id$
 
 import types
-from Object import newObject
+from Object import Object
 
 CACHE_STEP = 10
 
-def newList (server, sessionId, classname, cond, sort, properties):
-  return ObjectList (server, sessionId, classname, cond, sort, properties)
-
 # ===========================================================================
 # Class: ObjectList
 # ===========================================================================
@@ -109,7 +106,7 @@
         i += 1
         
       objData ["gnue_id"] = row [0]
-      obj = newObject (self._server, self._session_id, self.classname, objData)
+      obj = Object (self._server, self._session_id, self.classname, objData)
       self._cache.append (obj)
 
     # fix for gnue-common 0.5.1 release (will be removed for later releases 

Modified: trunk/gnue-appserver/src/language/Session.py
===================================================================
--- trunk/gnue-appserver/src/language/Session.py        2004-01-27 09:44:15 UTC 
(rev 5042)
+++ trunk/gnue-appserver/src/language/Session.py        2004-01-27 15:05:42 UTC 
(rev 5043)
@@ -21,23 +21,22 @@
 #
 # $Id$
 
-from ObjectList import newList
-from Object import newObject
+from ObjectList import ObjectList
+from Object import Object
 
+
 # ===========================================================================
 # CLASS session: implement a session of the language interface
 # ===========================================================================
-
 class Session:
 
   # -------------------------------------------------------------------------
-  # Constructor:
+  # Constructor
   # -------------------------------------------------------------------------
+  def __init__ (self, sessionManager, sessionId):
+    self._sm         = sessionManager
+    self._session_id = sessionId
 
-  def __init__ (self, sessionManager, user, password):
-    self._sm = sessionManager
-    self._session_id = self._sm.open ({'user': user, 'password': password})
-
   # -------------------------------------------------------------------------
   # Close the session 
   # -------------------------------------------------------------------------
@@ -71,22 +70,38 @@
   # Return a collection of 'classname' matching the given arguments
   # -------------------------------------------------------------------------
   def find (self, classname, cond=[], sort=['gnue_id'], properties=[]):
-    return newList (self._sm, self._session_id, classname, cond, sort,
-                    properties)
+    return ObjectList (self._sm, self._session_id, classname, cond, sort,
+                       properties)
 
   # -------------------------------------------------------------------------
   # Create a new instance of classname
   # -------------------------------------------------------------------------
   def new (self, classname):
-    return newObject (self._sm, self._session_id, classname)
+    return Object (self._sm, self._session_id, classname)
 
 
+
+# =============================================================================
+# Login-Session creates a new Session-Id using 'user' and 'password'
+# =============================================================================
+class LoginSession (Session):
+
+  # -------------------------------------------------------------------------
+  # Constructor
+  # -------------------------------------------------------------------------
+  def __init__ (self, sessionManager, user, password):
+    sessionId = sessionManager.open ({'user': user, 'password': password})
+    Session.__init__ (self, sessionManager, sessionId)
+
+
+
+# =============================================================================
+# InternalSession uses 0 as Session-Id
+# =============================================================================
 class InternalSession(Session):
 
   # -------------------------------------------------------------------------
-  # Constructor:
+  # Constructor
   # -------------------------------------------------------------------------
-
   def __init__ (self, sessionManager):
-    self._sm = sessionManager
-    self._session_id = 0
+    Session.__init__ (self, sessionManager, 0)

Modified: trunk/gnue-appserver/src/language/test.py
===================================================================
--- trunk/gnue-appserver/src/language/test.py   2004-01-27 09:44:15 UTC (rev 
5042)
+++ trunk/gnue-appserver/src/language/test.py   2004-01-27 15:05:42 UTC (rev 
5043)
@@ -19,7 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place 
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: test.py,v 1.1 2003/10/19 17:55:56 reinhard Exp $
+# $Id$
 #
 
 from gnue.appserver.language import App


Property changes on: trunk/gnue-appserver/src/test.py
___________________________________________________________________
Name: svn:keywords
   + Id


Property changes on: trunk/gnue-appserver/src/testRPC.py
___________________________________________________________________
Name: svn:keywords
   + Id