rclchm, rclepub: define config variables chmcatenate and epubcatenate to specify that the files should be indexed as a whole instead of as individual chapters

src/filters/rclchm

@@ -7,11 +7,6 @@ from __future__ import print_function
 # Note: this is not converted to python3, libchm does not have a
 # python3 wrapper at this point (2015-11)
 
-# Do we return individual chapters as html pages or concatenate everything?
-rclchm_catenate = 0
-# Use special html type to allow for mimeconf/mimeview Open magic,
-# Or go the regular html way with text/html
-#rclchm_html_mtype = "text/x-chm-html"
 rclchm_html_mtype = "text/html"
 
 import sys
@@ -20,9 +15,9 @@ import re
 import posixpath
 import urlparse
 import urllib
-if rclchm_catenate:
-    import subprocess
+import subprocess
 
+import rclconfig
 import rclexecm
 
 try:
@@ -196,7 +191,10 @@ class rclCHM:
         self.contents = []
         self.chm = chm.CHMFile()
         self.em = em
-        if rclchm_catenate:
+        cf = rclconfig.RclConfig()
+        self.catenate = cf.getConfParam("chmcatenate")
+        self.catenate = int(self.catenate) if self.catenate else False
+        if self.catenate:
             self.em.setmimetype("text/plain")
         else:
             self.em.setmimetype(rclchm_html_mtype)
@@ -314,7 +312,8 @@ class rclCHM:
         return self.extractone(params["ipath:"])
         
     def getnext(self, params):
-        if rclchm_catenate:
+        if self.catenate:
+            self.em.setmimetype("text/plain")
             alltxt = self.dumpall()
             if alltxt:
                 return (True, alltxt, "", rclexecm.RclExecM.eofnext)