merge development stuff from hplattner

expert/field.py

@@ -203,12 +203,3 @@ class SubReportField(Field):
         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()
-
-    

expert/report.py

@@ -30,7 +30,7 @@ from cybertools.composer.report.base import Report as BaseReport
 from cybertools.composer.report.base import LeafQueryCriteria, CompoundQueryCriteria
 from cybertools.composer.report.interfaces import IReport as IBaseReport
 from cybertools.composer.report.interfaces import IReportParams
-from cybertools.composer.report.result import CombinedResultSet, ResultSet, Row
+from cybertools.composer.report.result import ResultSet, Row
 from cybertools.util.jeep import Jeep
 from loops.common import AdapterBase
 from loops.interfaces import ILoopsAdapter
@@ -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,
-                         filterDuplicates=True)
-
-    def getCombinedResults(self):
-        return CombinedResultSet(self, self.getCategories(), self.getResults())
-
     def selectObjects(self, parts):
         # to be implemented by subclass
         return []