From 86e25111b549f7750856f6e418d8e4d96ab8056c Mon Sep 17 00:00:00 2001
From: hplattner <hannes@plattneronline.de>
Date: Tue, 3 Apr 2012 15:20:59 +0200
Subject: [PATCH] fix: replace Combined/CategoryResultSets with computed
 HeaderRows

---
 expert/field.py  |  9 ---------
 expert/report.py | 11 ++---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/expert/field.py b/expert/field.py
index 4be4f20..3f2a87d 100644
--- a/expert/field.py
+++ b/expert/field.py
@@ -202,13 +202,4 @@ class SubReportField(Field):
     def getValue(self, row):
         ri = self.getReportInstance(row)
         return ri.getResults()
-    
-    def getCategoryValue(self, row):
-        ri = self.getReportInstance(row)
-        return ri.getCategories()
-
-    def getCombinedValue(self, row):
-        ri = self.getReportInstance(row)
-        return ri.getCombinedResults()
-
     
\ No newline at end of file
diff --git a/expert/report.py b/expert/report.py
index 6aca624..c42fa51 100644
--- a/expert/report.py
+++ b/expert/report.py
@@ -77,6 +77,7 @@ class ReportInstance(BaseReport):
     adapts(IReport)
 
     rowFactory = Row
+    headerRowFactory = Row
 
     view = None     # set upon creation
 
@@ -102,16 +103,8 @@ class ReportInstance(BaseReport):
         result = list(self.selectObjects(parts))  # may modify parts
         qc = CompoundQueryCriteria(parts)
         return ResultSet(self, result, rowFactory=self.rowFactory,
+                         headerRowFactory=self.headerRowFactory,
                          sortCriteria=self.getSortCriteria(), queryCriteria=qc)
-        
-    def getCategories(self):
-        result = list(self.selectObjects(None))
-        return ResultSet(self, result, rowFactory=self.categoryRowFactory,
-                         filterDublicate=True)
-        
-    def getCombinedResults(self):
-        return CombinedResultSet(self, self.getCategories(), self.getResults())
-        
 
     def selectObjects(self, parts):
         # to be implemented by subclass