From d9766370d8eee5c067756af3c06a4b6ab6583d0e Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 21 Jun 2013 13:30:47 +0200 Subject: [PATCH] censor student files more --- librarian/pypdf.py | 27 +++++++++++++++++++-------- librarian/xmlutils.py | 5 ++++- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/librarian/pypdf.py b/librarian/pypdf.py index b261eb6..edd1f6d 100644 --- a/librarian/pypdf.py +++ b/librarian/pypdf.py @@ -66,8 +66,8 @@ def mark_alien_characters(text): class EduModule(Xmill): - def __init__(self, options=None): - super(EduModule, self).__init__(options) + def __init__(self, options=None, state=None): + super(EduModule, self).__init__(options, state) self.activity_counter = 0 self.exercise_counter = 0 @@ -174,9 +174,6 @@ class EduModule(Xmill): handle_naglowek_listy = \ handle_naglowek_osoba = \ handle_naglowek_podrozdzial = \ - handle_naglowek_podrozdzial = \ - handle_naglowek_rozdzial = \ - handle_naglowek_rozdzial = \ handle_naglowek_scena = \ handle_nazwa_utworu = \ handle_nota = \ @@ -197,6 +194,20 @@ class EduModule(Xmill): handle_dywiz = \ handle_texcommand + def handle_naglowek_rozdzial(self, element): + if not self.options['teacher']: + print element.text + if element.text.startswith((u'Wiedza', u'Zadania', u'Słowniczek')): + print 'not mute' + self.state['mute'] = False + else: + print 'mute' + self.state['mute'] = True + return None + return self.handle_texcommand(element) + handle_naglowek_rozdzial.unmuter = True + + def handle_uwaga(self, _e): return None def handle_extra(self, _e): @@ -218,7 +229,7 @@ class EduModule(Xmill): 'activity_counter': self.activity_counter, 'sub_gen': True, } - submill = EduModule(self.options) + submill = EduModule(self.options, self.state) if element.xpath('opis'): opis = submill.generate(element.xpath('opis')[0]) @@ -311,7 +322,7 @@ class EduModule(Xmill): if not typ in exercise_handlers: return '(no handler)' self.options = {'exercise_counter': self.exercise_counter} - handler = exercise_handlers[typ](self.options) + handler = exercise_handlers[typ](self.options, self.state) return handler.generate(element) # XXX this is copied from pyhtml.py, except for return and @@ -328,7 +339,7 @@ class EduModule(Xmill): if defloc: definiens = defloc[0].getnext() if definiens.tag == 'definiens': - subgen = EduModule(self.options) + subgen = EduModule(self.options, self.state) definiens_s = subgen.generate(definiens) return u'', u": " + definiens_s diff --git a/librarian/xmlutils.py b/librarian/xmlutils.py index 9768623..bbcc884 100644 --- a/librarian/xmlutils.py +++ b/librarian/xmlutils.py @@ -12,8 +12,9 @@ class Xmill(object): Used instead of XSLT which is difficult and cumbersome. """ - def __init__(self, options=None): + def __init__(self, options=None, state=None): self._options = [] + self.state = state or {} if options: self._options.append(options) self.text_filters = [] @@ -103,6 +104,7 @@ class Xmill(object): if isinstance(element, etree._Comment): return None handler = self._handle_for_element(element) + if self.state.get('mute') and not getattr(handler, 'unmuter', False): return None # How many scopes try: options_scopes = len(self._options) @@ -127,6 +129,7 @@ class Xmill(object): finally: # clean up option scopes if necessary self._options = self._options[0:options_scopes] + return out -- 2.20.1