gnue-appserver/src geasList.py geasSession.py g...

[Reinhard Mueller]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-appserver
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/08/11 11:22:11

Modified files:
        src            : geasList.py geasSession.py 
                         geasSessionManager.py 
        src/classrep   : __init__.py 

Log message:
        Finally use Class Repository in Appserver. Authentication and Triggers 
are
        temporarly deactivated until the needed classes are defined.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasList.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSession.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/geasSessionManager.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-appserver/src/classrep/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue-appserver/src/classrep/__init__.py
diff -c gnue-appserver/src/classrep/__init__.py:1.5 
gnue-appserver/src/classrep/__init__.py:1.6
*** gnue-appserver/src/classrep/__init__.py:1.5 Fri Aug  8 15:56:26 2003
--- gnue-appserver/src/classrep/__init__.py     Mon Aug 11 11:22:11 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.5 2003/08/08 19:56:26 reinhard Exp $
  
  from Module import *
  from Class  import *
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: __init__.py,v 1.6 2003/08/11 15:22:11 reinhard Exp $
  
  from Module import *
  from Class  import *
***************
*** 41,46 ****
    classes = ClassDict (None, modules)
    # Now, we can access the database to load the real repository
    session = Session.Session (server, None, None)
!   modules = ModuleDict (session)
!   classes = ClassDict (session, modules)
    return
--- 41,48 ----
    classes = ClassDict (None, modules)
    # Now, we can access the database to load the real repository
    session = Session.Session (server, None, None)
!   new_modules = ModuleDict (session)
!   new_classes = ClassDict (session, new_modules, module = new_modules 
["gnue"])
!   modules = new_modules
!   classes = new_classes
    return
Index: gnue-appserver/src/geasList.py
diff -c gnue-appserver/src/geasList.py:1.20 gnue-appserver/src/geasList.py:1.21
*** gnue-appserver/src/geasList.py:1.20 Mon Aug 11 10:26:49 2003
--- gnue-appserver/src/geasList.py      Mon Aug 11 11:22:11 2003
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasList.py,v 1.20 2003/08/11 14:26:49 reinhard Exp $
  
  from gnue.common.datasources import GDataSource,GConditions
  import geasInstance
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasList.py,v 1.21 2003/08/11 15:22:11 reinhard Exp $
  
  from gnue.common.datasources import GDataSource,GConditions
  import geasInstance
***************
*** 36,42 ****
    # 
---------------------------------------------------------------------------
  
    def __init__ (self, session, classname):
-     print "*** Creating List: %s" % classname
      self._session = session
      self._classname = classname
      self._prefetch = []
--- 36,41 ----
***************
*** 107,118 ****
    # 
---------------------------------------------------------------------------
  
    def firstInstance (self):
!     if self._classname != "appserver_pytrigger" \
!        and self._classname != "gnue_module":
!       trigger=self._session._triggerMg.getTriggerByEvent \
!                ('%s:pre_first_inst' % self._classname)
!       if trigger!=None:
!         trigger()
          
      if self._resultset.firstRecord () != None:
        return geasInstance.geasInstance (self,  self._resultset.current)
--- 106,117 ----
    # 
---------------------------------------------------------------------------
  
    def firstInstance (self):
! #   if self._classname != "appserver_pytrigger" \
! #      and self._classname != "gnue_module":
! #     trigger=self._session._triggerMg.getTriggerByEvent \
! #              ('%s:pre_first_inst' % self._classname)
! #     if trigger!=None:
! #       trigger()
          
      if self._resultset.firstRecord () != None:
        return geasInstance.geasInstance (self,  self._resultset.current)
Index: gnue-appserver/src/geasSession.py
diff -c gnue-appserver/src/geasSession.py:1.27 
gnue-appserver/src/geasSession.py:1.28
*** gnue-appserver/src/geasSession.py:1.27      Mon Aug 11 10:26:49 2003
--- gnue-appserver/src/geasSession.py   Mon Aug 11 11:22:11 2003
***************
*** 19,29 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasSession.py,v 1.27 2003/08/11 14:26:49 reinhard Exp $
  
  import geasList
  import geasTrigger 
  import geasAuthentification
  import whrandom
  
  # 
=============================================================================
--- 19,30 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: geasSession.py,v 1.28 2003/08/11 15:22:11 reinhard Exp $
  
  import geasList
  import geasTrigger 
  import geasAuthentification
+ import classrep
  import whrandom
  
  # 
=============================================================================
***************
*** 66,71 ****
--- 67,79 ----
      self._triggerMg = geasTrigger.geasPythonDBTriggerMg(self)
  
    # 
---------------------------------------------------------------------------
+   # Get class definition from class name
+   # 
---------------------------------------------------------------------------
+ 
+   def getClassdef (self, classname):
+     return classrep.classes [classname]
+ 
+   # 
---------------------------------------------------------------------------
    # Log into the application server
    # 
---------------------------------------------------------------------------
  
***************
*** 91,106 ****
  
    def createList (self, classname):
      
      # check if user has access rights for this list
      if not self._authAdapter.hasAccess (self, self._user, classname):
        return None
        
      # pre_new_list trigger
!     if classname != "appserver_pytrigger" \
!        and classname != "gnue_module":
!       tr=self._triggerMg.getTriggerByEvent('%s:pre_new_list' % classname)
!       if tr!=None:
!         tr()
        
      # create new List
      newlist=geasList.geasList (self, classname)
--- 99,116 ----
  
    def createList (self, classname):
      
+     classdef = self.getClassdef (classname)
+ 
      # check if user has access rights for this list
      if not self._authAdapter.hasAccess (self, self._user, classname):
        return None
        
      # pre_new_list trigger
! #   if classname != "appserver_pytrigger" \
! #      and classname != "gnue_module":
! #     tr=self._triggerMg.getTriggerByEvent('%s:pre_new_list' % classname)
! #     if tr!=None:
! #       tr()
        
      # create new List
      newlist=geasList.geasList (self, classname)
Index: gnue-appserver/src/geasSessionManager.py
diff -c gnue-appserver/src/geasSessionManager.py:1.9 
gnue-appserver/src/geasSessionManager.py:1.10
*** gnue-appserver/src/geasSessionManager.py:1.9        Fri Aug  8 15:33:51 2003
--- gnue-appserver/src/geasSessionManager.py    Mon Aug 11 11:22:11 2003
***************
*** 19,25 ****
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.9 2003/08/08 19:33:51 reinhard Exp $
  
  from geasList import *
  from geasSession import *
--- 19,25 ----
  #
  # Copyright 2001-2003 Free Software Foundation
  #
! # $Id: geasSessionManager.py,v 1.10 2003/08/11 15:22:11 reinhard Exp $
  
  from geasList import *
  from geasSession import *
***************
*** 39,45 ****
      self._authAdapter = geasAuthentification.geasAuthAgent ()
      classrep.init (self)
      # use DB for authetification
!     self._authAdapter = geasAuthentification.geasDBAuthAgent()
  
    def _getSession(self,sess_id):
      try:
--- 39,46 ----
      self._authAdapter = geasAuthentification.geasAuthAgent ()
      classrep.init (self)
      # use DB for authetification
!     # self._authAdapter = geasAuthentification.geasDBAuthAgent()
!     # Commented out as long as authentication classes are not fully defined
  
    def _getSession(self,sess_id):
      try: