r6557 - trunk/gnue-navigator/src

[johannes]

Author: johannes
Date: 2004-10-24 08:18:12 -0500 (Sun, 24 Oct 2004)
New Revision: 6557

Modified:
   trunk/gnue-navigator/src/GNObjects.py
   trunk/gnue-navigator/src/GNParser.py
Log:
user proper parentTag for parameters, fixed calling of reports (wrt params)


Modified: trunk/gnue-navigator/src/GNObjects.py
===================================================================
--- trunk/gnue-navigator/src/GNObjects.py       2004-10-24 11:04:52 UTC (rev 
6556)
+++ trunk/gnue-navigator/src/GNObjects.py       2004-10-24 13:18:12 UTC (rev 
6557)
@@ -121,14 +121,6 @@
       'comment':None,
       'exclude_xml':None }
 
-    # get parameters
-    # moved to GNStep - jst 
-    #for child in step._children:
-    #  if child._type=="GNParameter":
-    #    params[child.name]=child.value
-    
-    params.update(self._params)
-
     i = self
     while i._parent!=None:
       i=i._parent
@@ -141,7 +133,7 @@
                            destinationOptions = params["destination_options"],
                            filter = params['filter'],
                            filterOptions = params['filter_options'],
-                  #         parameters=userParameters,
+                           parameters = step._params,
                            sortoption=params["sortoption"],
                            includeStructuralComments=params["comment"],
                            omitGNUeXML=params["exclude_xml"])

Modified: trunk/gnue-navigator/src/GNParser.py
===================================================================
--- trunk/gnue-navigator/src/GNParser.py        2004-10-24 11:04:52 UTC (rev 
6556)
+++ trunk/gnue-navigator/src/GNParser.py        2004-10-24 13:18:12 UTC (rev 
6557)
@@ -122,7 +122,7 @@
             'value': {
                'Unique': 1,
                'Typecast': GTypecast.text } },
-         'ParentTags': ('parameter',) },
+         'ParentTags': ('step',) },
 
       'description': {
          'BaseClass': GNObjects.GNDescription,