gnue common/src/GRootObj.py common/src/GTrigger...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/23 11:52:37

Modified files:
        common/src     : GRootObj.py GTrigger.py 
        forms/src      : GFForm.py GFTrigger.py 

Log message:
        added support for runForm() in global namespace of forms; minor 
bugfixes in trigger system

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GRootObj.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GTrigger.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.175&tr2=1.176&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFTrigger.py.diff?tr1=1.57&tr2=1.58&r1=text&r2=text

Patches:
Index: gnue/common/src/GRootObj.py
diff -c gnue/common/src/GRootObj.py:1.2 gnue/common/src/GRootObj.py:1.3
*** gnue/common/src/GRootObj.py:1.2     Thu Jan 31 21:25:51 2002
--- gnue/common/src/GRootObj.py Mon Sep 23 11:52:37 2002
***************
*** 16,22 ****
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000, 2001, 2002 Free Software Foundation
  #
  #
  # FILE:
--- 16,22 ----
  # write to the Free Software Foundation, Inc., 59 Temple Place 
  # - Suite 330, Boston, MA 02111-1307, USA.
  #
! # Copyright 2000-2002 Free Software Foundation
  #
  #
  # FILE:
***************
*** 41,47 ****
      
    def initTriggerSystem(self):
      self._triggerNamespaceTree = GTriggerNamespace(self)
!   
  
  
  
--- 41,47 ----
      
    def initTriggerSystem(self):
      self._triggerNamespaceTree = GTriggerNamespace(self)
! 
  
  
  
Index: gnue/common/src/GTrigger.py
diff -c gnue/common/src/GTrigger.py:1.17 gnue/common/src/GTrigger.py:1.18
*** gnue/common/src/GTrigger.py:1.17    Thu Jul  4 14:41:36 2002
--- gnue/common/src/GTrigger.py Mon Sep 23 11:52:37 2002
***************
*** 50,56 ****
    pass
  
  
!         
  
  #######################################################################
  #
--- 50,56 ----
    pass
  
  
! 
  
  #######################################################################
  #
***************
*** 79,93 ****
    # constructTriggerObject
    #
    # Travels down thru a GObj based tree and builds a set
!   # of GTriggerNSObjects that will implement the namespace 
    # inside triggers.
!   # 
    def constructTriggerObject(self, gobjObject, triggerParent=None):
      triggerObject = None
  
      # Some items in a GObj tree may not be GObj based (GContent for instance)
!     
!     if isinstance(gobjObject,GObj) and hasattr(gobjObject,'name'): 
        triggerObject = GTriggerNSObject(triggerParent)
        triggerObject._object = gobjObject
  
--- 79,93 ----
    # constructTriggerObject
    #
    # Travels down thru a GObj based tree and builds a set
!   # of GTriggerNSObjects that will implement the namespace
    # inside triggers.
!   #
    def constructTriggerObject(self, gobjObject, triggerParent=None):
      triggerObject = None
  
      # Some items in a GObj tree may not be GObj based (GContent for instance)
! 
!     if isinstance(gobjObject,GObj) and hasattr(gobjObject,'name'):
        triggerObject = GTriggerNSObject(triggerParent)
        triggerObject._object = gobjObject
  
***************
*** 98,108 ****
        # setup get and set functions when they exist in the GObj
        triggerObject._triggerSet = gobjObject._triggerSet
        triggerObject._triggerGet = gobjObject._triggerGet
!       
!       # Add any trigger methods defined by GObj 
        if len(gobjObject._triggerFunctions):
          for item in gobjObject._triggerFunctions.keys():
!           
            if type(gobjObject._triggerFunctions[item]['function']) == 
types.MethodType:
              object = 
GTriggerNSFunction(item,gobjObject._triggerFunctions[item]['function'])         
               
              triggerObject.__dict__[item] = object
--- 98,108 ----
        # setup get and set functions when they exist in the GObj
        triggerObject._triggerSet = gobjObject._triggerSet
        triggerObject._triggerGet = gobjObject._triggerGet
! 
!       # Add any trigger methods defined by GObj
        if len(gobjObject._triggerFunctions):
          for item in gobjObject._triggerFunctions.keys():
! 
            if type(gobjObject._triggerFunctions[item]['function']) == 
types.MethodType:
              object = 
GTriggerNSFunction(item,gobjObject._triggerFunctions[item]['function'])         
               
              triggerObject.__dict__[item] = object
***************
*** 155,161 ****
      self._triggerSet = None
      self._triggerGet = None
      self._object = None
!     
    #
    # showTree
    #
--- 155,161 ----
      self._triggerSet = None
      self._triggerGet = None
      self._object = None
! 
    #
    # showTree
    #
***************
*** 390,397 ****
    # TODO: merge the local namespace of the object that
    # TODO: fired the trigger.
    def initialize(self):
!     self._form = self.findParentOfType('GFForm')
!     self._triggerns.update( self._form._triggerns )
      self.__call__ = self.dummyFunction
  
      if self.type != "NAMED":
--- 390,396 ----
    # TODO: merge the local namespace of the object that
    # TODO: fired the trigger.
    def initialize(self):
!     self._triggerns.update( self._root._triggerns )
      self.__call__ = self.dummyFunction
  
      if self.type != "NAMED":
***************
*** 399,412 ****
          self._parent.addTrigger( self.type, self )
          self._triggerns.update(self._parent._localTriggerNamespace)
      else:
!       form = self.findParentOfType('GFForm')
!       form._triggerDictionary[self.name] = self
!       self._triggerns.update(form._localTriggerNamespace)
  
!     if self.src == None: 
        self.setFunction( self.getChildrenAsContent(), self.language )
      else:
!       self.setFunctionFrom(self._form._triggerDictionary[self.src])
  
  
    def setFunctionFrom(self, object):
--- 398,410 ----
          self._parent.addTrigger( self.type, self )
          self._triggerns.update(self._parent._localTriggerNamespace)
      else:
!       self._root._triggerDictionary[self.name] = self
!       self._triggerns.update(self._root._localTriggerNamespace)
  
!     if self.src == None:
        self.setFunction( self.getChildrenAsContent(), self.language )
      else:
!       self.setFunctionFrom(self._root._triggerDictionary[self.src])
  
  
    def setFunctionFrom(self, object):
***************
*** 426,432 ****
        GDebug.printMesg(0, "The trigger named %s contains a tab character 
which is not allowed at pos %s"
                         % ( self.name, string.find('\t', self._text) ))
        sys.exit()
!       
      # Remove whitespace from last line
      self._text = string.rstrip(self._text)
  
--- 424,430 ----
        GDebug.printMesg(0, "The trigger named %s contains a tab character 
which is not allowed at pos %s"
                         % ( self.name, string.find('\t', self._text) ))
        sys.exit()
! 
      # Remove whitespace from last line
      self._text = string.rstrip(self._text)
  
***************
*** 435,441 ****
      #   syntax errors are spotted during XML parsing rather than
      #   during execution.
  
!     # Get the indentation level of the first line of code so 
      # we can indent our imports to the same level
      indentLevel = 0
      for line in string.split(string.replace(self._text,'\r',''),'\n'):
--- 433,439 ----
      #   syntax errors are spotted during XML parsing rather than
      #   during execution.
  
!     # Get the indentation level of the first line of code so
      # we can indent our imports to the same level
      indentLevel = 0
      for line in string.split(string.replace(self._text,'\r',''),'\n'):
***************
*** 539,545 ****
        hasContent = 0 
        for child in self._children: 
          hasContent = hasContent or isinstance(child,GContent)
!       if hasContent: 
          xmlString += ">"
        else: 
          xmlString += ">\n"
--- 537,543 ----
        hasContent = 0 
        for child in self._children: 
          hasContent = hasContent or isinstance(child,GContent)
!       if hasContent:
          xmlString += ">"
        else: 
          xmlString += ">\n"
***************
*** 556,562 ****
          xmlString += "</%s>\n" % (xmlEntity)
        else: 
          xmlString += "%s</%s>\n" % (gap[:-2], xmlEntity)
!     else: 
        xmlString += "/>\n"      
      return xmlString
  
--- 554,560 ----
          xmlString += "</%s>\n" % (xmlEntity)
        else: 
          xmlString += "%s</%s>\n" % (gap[:-2], xmlEntity)
!     else:
        xmlString += "/>\n"      
      return xmlString
  
***************
*** 594,600 ****
        print _("Invalid trigger "),key
  
    # processTrigger
!   # 
    # "fires" the trigger
    def processTrigger(self, key):
      key = string.upper(key)
--- 592,598 ----
        print _("Invalid trigger "),key
  
    # processTrigger
!   #
    # "fires" the trigger
    def processTrigger(self, key):
      key = string.upper(key)
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.175 gnue/forms/src/GFForm.py:1.176
*** gnue/forms/src/GFForm.py:1.175      Tue Sep 17 20:27:50 2002
--- gnue/forms/src/GFForm.py    Mon Sep 23 11:52:37 2002
***************
*** 75,81 ****
      self._app = app
  
      self._triggerns={}
!     
      # This will be set by GFInstance
      self._parameters = {}
  
--- 75,81 ----
      self._app = app
  
      self._triggerns={}
! 
      # This will be set by GFInstance
      self._parameters = {}
  
***************
*** 142,148 ****
  
      self.initTriggerSystem()
      self._triggerns.update(self._triggerNamespaceTree._globalNamespace)
!     
    #
    # Secondary init (stuff that must happen
    # after all our children have init'ed)
--- 142,150 ----
  
      self.initTriggerSystem()
      self._triggerns.update(self._triggerNamespaceTree._globalNamespace)
!     # TODO: Is this right
!     self._triggerns['runForm'] = self._app.manager.runFormFromTrigger
! 
    #
    # Secondary init (stuff that must happen
    # after all our children have init'ed)
Index: gnue/forms/src/GFTrigger.py
diff -c gnue/forms/src/GFTrigger.py:1.57 gnue/forms/src/GFTrigger.py:1.58
*** gnue/forms/src/GFTrigger.py:1.57    Tue May  7 13:24:13 2002
--- gnue/forms/src/GFTrigger.py Mon Sep 23 11:52:37 2002
***************
*** 49,55 ****
                    'PRE-UPDATE':     'Pre-Update',
                    'PRE-INSERT':     'Pre-Insert',
                    'PRE-DELETE':     'Pre-Delete',
!                   'PRE-MODIFY':     'Pre-Modify', 
                    'ON-NEWRECORD':   'On-NewRecord' }
  
  #
--- 49,55 ----
                    'PRE-UPDATE':     'Pre-Update',
                    'PRE-INSERT':     'Pre-Insert',
                    'PRE-DELETE':     'Pre-Delete',
!                   'PRE-MODIFY':     'Pre-Modify',
                    'ON-NEWRECORD':   'On-NewRecord' }
  
  #
***************
*** 106,111 ****
--- 106,115 ----
        GContent(self, text)
      if self.type != None:
        self._buildObject()
+       
+   def initialize(self): 
+     self._root = self.findParentOfType('GFForm')
+     GTrigger.initialize(self)