[gnue] r7555 - in trunk: gnue-appserver/src/gcd gnue-common/src/definitions gnue-common/src/logic

[btami]

Author: btami
Date: 2005-05-31 15:53:11 -0500 (Tue, 31 May 2005)
New Revision: 7555

Modified:
   trunk/gnue-appserver/src/gcd/GCParser.py
   trunk/gnue-common/src/definitions/GParser.py
   trunk/gnue-common/src/logic/GTrigger.py
Log:
support for including trigger/procedure code from external file

Modified: trunk/gnue-appserver/src/gcd/GCParser.py
===================================================================
--- trunk/gnue-appserver/src/gcd/GCParser.py    2005-05-25 13:49:07 UTC (rev 
7554)
+++ trunk/gnue-appserver/src/gcd/GCParser.py    2005-05-31 20:53:11 UTC (rev 
7555)
@@ -167,6 +167,8 @@
             'Typecast': GTypecast.name},
           'type': {
             'Typecast': GTypecast.text},
+          'file': {
+            'Typecast': GTypecast.name },
           'nullable': {
             'Default' : True,
             'Typecast': GTypecast.boolean},

Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py        2005-05-25 13:49:07 UTC 
(rev 7554)
+++ trunk/gnue-common/src/definitions/GParser.py        2005-05-31 20:53:11 UTC 
(rev 7555)
@@ -447,7 +447,20 @@
     self.xmlStack.insert(0, object)
     self.nameStack.insert(0, name)
 
+    # processing trigger/procedure code from external files
+    for qattr in saxattrs.keys():
+      attrns, attr = qattr
 
+      if baseAttrs.has_key ('file') and attr == 'file':
+        textEncoding=gConfig('textEncoding')
+        handle = openResource(attrs[attr])
+        text = handle.read().decode(textEncoding)
+        handle.close()
+        
+        if self.xmlStack[0] != None:
+          GContent(self.xmlStack[0], text)
+
+
   #
   # Called by the internal SAX parser whenever
   # text (not part of a tag) is encountered.

Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2005-05-25 13:49:07 UTC (rev 
7554)
+++ trunk/gnue-common/src/logic/GTrigger.py     2005-05-31 20:53:11 UTC (rev 
7555)
@@ -336,6 +336,8 @@
                'Typecast': GTypecast.name },
             'type': {
                'Typecast': GTypecast.uppername },
+            'file': {
+               'Typecast': GTypecast.name },
             'src': {
                'Label': _('Source Trigger'),
                'References': 'trigger.name',