consequently use reporting view base class instead of specialized class; + other improvements

expert/browser/configure.zcml

@@ -99,4 +99,10 @@
         factory="loops.expert.browser.report.EmbeddedResultsConceptView"
         permission="zope.View" />
 
+  <browser:page
+        name="concept_results.csv"
+        for="loops.organize.interfaces.IConceptSchema"
+        class="loops.expert.browser.export.ResultsConceptCSVExport"
+        permission="zope.View" />
+
 </configure>

expert/browser/export.py

@@ -69,8 +69,7 @@ class ResultsConceptCSVExport(ResultsConceptView):
                 value = f.getValue(row)
                 if ILoopsObject.providedBy(value):
                     value = value.title
-                if isinstance(value, unicode):
+                value = encode(value, self.encoding)
-                    value = value.encode(self.encoding)
                 data[f.name] = value
             writer.writerow(data)
         text = output.getvalue()
@@ -86,3 +85,20 @@ class ResultsConceptCSVExport(ResultsConceptView):
         response.setHeader('Pragma', '')
         response.setHeader('Content-Type', 'text/csv')
         response.setHeader('Content-Length', len(text))
+
+
+def encode(text, encoding):
+    if not isinstance(text, unicode):
+        return text
+    try:
+        return text.encode(encoding)
+    except UnicodeEncodeError:
+        result = []
+        for c in text:
+            try:
+                result.append(c.encode(encoding))
+            except UnicodeEncodeError:
+                result.append('?')
+        return ''.join(result)
+    return '???'
+

expert/browser/report.py

@@ -193,6 +193,8 @@ class ResultsConceptView(ConceptView):
     @Lazy
     def downloadLink(self, format='csv'):
         opt = self.options('download_' + format)
+        if not opt:
+            opt = self.typeOptions('download_' + format)
         if opt:
             return opt[0]
 

knowledge/qualification/browser.py

@@ -34,10 +34,9 @@ from loops.util import _
 
 class Qualifications(ResultsConceptView):
 
-    reportName = 'qualification_overview'
+    # obsolete because we can directly use ResultsConceptView
 
+    #reportName = 'qualification_overview'
 
-class QualificationsCSVExport(ResultsConceptCSVExport):
+    pass    # report assigned to query via hasReport relation
-
-    reportName = 'qualification_overview'
 

knowledge/qualification/configure.zcml

@@ -23,12 +23,6 @@
         factory="loops.knowledge.qualification.browser.Qualifications"
         permission="zope.View" />
 
-  <browser:page
-      name="qualifications.csv"
-      for="loops.organize.interfaces.IConceptSchema"
-      class="loops.knowledge.qualification.browser.QualificationsCSVExport"
-      permission="zope.View" />
-
   <!-- reports -->
 
   <zope:adapter