gnue/appserver/src/_featuretest GEMA.py atest.p...

[Jan Ischebeck]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jan Ischebeck <address@hidden>  02/06/21 10:34:34

Modified files:
        appserver/src/_featuretest: GEMA.py atest.py create_tables.sql 
                                    TODO 

Log message:
        add a global namespace to instance methods.
        i.e. you can access Address.newinstance from an instance method

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/GEMA.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/atest.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/create_tables.sql.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/TODO.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/appserver/src/_featuretest/GEMA.py
diff -c gnue/appserver/src/_featuretest/GEMA.py:1.3 
gnue/appserver/src/_featuretest/GEMA.py:1.4
*** gnue/appserver/src/_featuretest/GEMA.py:1.3 Wed Jun 19 09:26:11 2002
--- gnue/appserver/src/_featuretest/GEMA.py     Fri Jun 21 10:34:34 2002
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: GEMA.py,v 1.3 2002/06/19 13:26:11 siesel Exp $
  
  # 
=============================================================================
  # Basic class
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: GEMA.py,v 1.4 2002/06/21 14:34:34 siesel Exp $
  
  # 
=============================================================================
  # Basic class
***************
*** 42,51 ****
      self._dataStorage = dataStorage
  
    def registerNativeMethod(self,objectFile):
!     return geasNativeMethod(objectFile)
    
    def registerPythonMethod(self,methodSource):
!     return geasPythonMethod(methodSource)
       
    # 
---------------------------------------------------------------------------
    # Call a method
--- 42,51 ----
      self._dataStorage = dataStorage
  
    def registerNativeMethod(self,objectFile):
!     return geasNativeMethod(getNewOID(),0,objectFile)
    
    def registerPythonMethod(self,methodSource):
!     return geasPythonMethod(getNewOID(),0,methodSource)
       
    # 
---------------------------------------------------------------------------
    # Call a method
***************
*** 132,139 ****
       for i in params:
         args["param%s" % j]=i
         j=j+1
! #     exec self.compiledMethod in self._ns,args
!      exec self.compiledMethod in globals(),args
       return args["rvalue"]      
   
     def addPreMethodHook(self,hook):
--- 132,139 ----
       for i in params:
         args["param%s" % j]=i
         j=j+1
!      exec self.compiledMethod in self._ns._nameSpace,args
! #     exec self.compiledMethod in globals(),args
       return args["rvalue"]      
   
     def addPreMethodHook(self,hook):
Index: gnue/appserver/src/_featuretest/TODO
diff -c gnue/appserver/src/_featuretest/TODO:1.2 
gnue/appserver/src/_featuretest/TODO:1.3
*** gnue/appserver/src/_featuretest/TODO:1.2    Wed Jun 19 09:15:46 2002
--- gnue/appserver/src/_featuretest/TODO        Fri Jun 21 10:34:34 2002
***************
*** 26,28 ****
--- 26,31 ----
  add local/remote attribut to geasObject. local objects can be changed, remote 
object are created on an other instance of the appserver and a change object 
request has to be sended to the other instance. this request will be polled and 
a result has to be returned before the next commit.
  
  create a parent/meta object for metaobject namespace obj etc....       (done)
+ 
+ rework geasList to be closer connected to geasMetaObject and return also 
+ local (i.e. created but not commited) instances
Index: gnue/appserver/src/_featuretest/atest.py
diff -c gnue/appserver/src/_featuretest/atest.py:1.3 
gnue/appserver/src/_featuretest/atest.py:1.4
*** gnue/appserver/src/_featuretest/atest.py:1.3        Wed Jun 19 16:42:17 2002
--- gnue/appserver/src/_featuretest/atest.py    Fri Jun 21 10:34:34 2002
***************
*** 19,25 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: atest.py,v 1.3 2002/06/19 20:42:17 siesel Exp $
  
  import os
  from gnue.common import GClientApp
--- 19,25 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # $Id: atest.py,v 1.4 2002/06/21 14:34:34 siesel Exp $
  
  import os
  from gnue.common import GClientApp
***************
*** 87,93 ****
            % instance.formatAddress()
      print "\nNow call the function 'do' of the instance:"
      instance.do("nothing", "in the sun", "working","on the edge")
- 
      print "\nCall showAddress for all Instances:\n"
      list=self.sess.Address.getAllInstances()    
      instance=list.firstInstance ()
--- 87,92 ----
***************
*** 97,102 ****
--- 96,109 ----
      
      print "Thank you for playing!"
      
+   def showMethodNamespace(self):
+     print "-"*30
+     print "Show global namespace for instance"
+     print "-"*30
+     instance=self.sess.Address.newInstance()
+     instance.showNamespace()
+     print "-"*30
+     
    def execMenu(self,menu,default):
      print
      keys=menu.keys()
***************
*** 109,115 ****
      res=0
      while res!='9':
        menu = {'0':'Show all classes','1':'show object server cache',
!               '2':'basic test run',
                '9':'end'}
        res=self.execMenu(menu,'2')
        if res=='0':
--- 116,122 ----
      res=0
      while res!='9':
        menu = {'0':'Show all classes','1':'show object server cache',
!               '2':'basic test run','3':'Show Namespace of a method',
                '9':'end'}
        res=self.execMenu(menu,'2')
        if res=='0':
***************
*** 147,152 ****
--- 154,161 ----
          print '-' * 40
        elif res=='2':
          self.basictest()
+       elif res=='3':
+         self.showMethodNamespace()
        
        
      
Index: gnue/appserver/src/_featuretest/create_tables.sql
diff -c gnue/appserver/src/_featuretest/create_tables.sql:1.1 
gnue/appserver/src/_featuretest/create_tables.sql:1.2
*** gnue/appserver/src/_featuretest/create_tables.sql:1.1       Thu May 23 
17:13:28 2002
--- gnue/appserver/src/_featuretest/create_tables.sql   Fri Jun 21 10:34:34 2002
***************
*** 10,15 ****
--- 10,16 ----
  insert into geas_meta_object values (15,'print','string','print(param1)');
  insert into geas_meta_object values 
(15,'printit','function','self.print("Hello")');
  insert into geas_meta_object values (15,'do','function','print("This function 
prints its parameters:")\nfor i in params:\n   print("(%s)" % 
i)\nprint("Bye")\n');
+ insert into geas_meta_object values (15,'showNamespace','function','print 
"local:",dir()\nprint "global:",globals()');
  
  drop table geas_name_space;
  create table geas_name_space (goid int, name varchar, ref_OID int);