[PythonReports-checkins] PythonReports/PythonReports builder.py, 1.7, 1.8

[alexander s. <a1...@us...>]

Update of /cvsroot/pythonreports/PythonReports/PythonReports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17127

Modified Files:
	builder.py 
Log Message:
straighten "if not/else" logic in Builder.run_subreport();
build_section: refetch context after subreports build

Index: builder.py
===================================================================
RCS file: /cvsroot/pythonreports/PythonReports/PythonReports/builder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** builder.py	19 Dec 2006 14:08:49 -0000	1.7
--- builder.py	19 Dec 2006 16:45:30 -0000	1.8
***************
*** 2,5 ****
--- 2,7 ----
  # FIXME: column-based variables are not intelligible
  """History (most recent first):
+ 19-dec-2006 [als]   straighten "if not/else" logic in Builder.run_subreport();
+                     build_section: refetch context after subreports build
  18-dec-2006 [als]   Builder: added .get_page_dimensions();
                      update self.context before building the detail section
***************
*** 1631,1635 ****
          _inline = element.get("inline")
          # fetch or make a builder
!         if element not in self.subreports:
              _prt_name = element.get("template")
              _prt = prt.load(self.filepath(_prt_name))
--- 1633,1639 ----
          _inline = element.get("inline")
          # fetch or make a builder
!         if element in self.subreports:
!             _builder = self.subreports[element]
!         else:
              _prt_name = element.get("template")
              _prt = prt.load(self.filepath(_prt_name))
***************
*** 1670,1675 ****
                  _builder.inlined = None
              self.subreports[element] = _builder
-         else:
-             _builder = self.subreports[element]
          # collect subreport arguments
          # Note: this is done before any new section is built
--- 1674,1677 ----
***************
*** 1777,1780 ****
--- 1779,1784 ----
              self.run_subreport_collection(_section.subreports_before, _frame)
              # reevaluate the section
+             # NB: this discards the context passed in arguments
+             _context = self.context
              _section.build(_context)
              if not _section.printable: