X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/ba8c5f53b309b7ee2d993397e24640615777ab16..a17ace8296df1d91d9f940c80d96a269eba626e5:/librarian/pyhtml.py diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py index 909217a..106e30b 100644 --- a/librarian/pyhtml.py +++ b/librarian/pyhtml.py @@ -6,7 +6,7 @@ from lxml import etree from librarian import OutputFile, RDFNS, DCNS from xmlutils import Xmill, tag, tagged, ifoption - +import random class EduModule(Xmill): def __init__(self, *args): @@ -37,7 +37,7 @@ class EduModule(Xmill): def handle_aktywnosc(self, element): self.activity_counter += 1 self.options = { - 'activity': True, + 'activity': True, 'activity_counter': self.activity_counter } submill = EduModule() @@ -61,7 +61,7 @@ class EduModule(Xmill): return u"""
-
%(counter)d. +
%(counter)d. %(opis)s %(wskazowki)s
@@ -76,27 +76,28 @@ class EduModule(Xmill): handle_opis = ifoption(activity=False)(tag('div', 'description')) handle_wskazowki = ifoption(activity=False)(tag('div', ('hints', 'teacher'))) - + @ifoption(activity=False) @tagged('div', 'materials') def handle_pomoce(self, _): return "Pomoce: ", "" - + def handle_czas(self, *_): return def handle_forma(self, *_): return - + def handle_cwiczenie(self, element): excercise_handlers = { 'wybor': Wybor, 'uporzadkuj': Uporzadkuj, 'luki': Luki, 'zastap': Zastap, - 'przyporzadkuj': Przyporzadkuj + 'przyporzadkuj': Przyporzadkuj, + 'prawdafalsz': PrawdaFalsz } - + typ = element.attrib['typ'] handler = excercise_handlers[typ](self.options) return handler.generate(element) @@ -108,17 +109,17 @@ class EduModule(Xmill): self.options = {'slowniczek': True} return '
', '
' ### robie teraz punkty wyboru - listtag = {'num': 'ol', - 'punkt': 'ul', - 'alfa': 'ul', + listtag = {'num': 'ol', + 'punkt': 'ul', + 'alfa': 'ul', 'czytelnia': 'ul'}[ltype] classes = attrs.get('class', '') if classes: del attrs['class'] - + attrs_s = ' '.join(['%s="%s"' % kv for kv in attrs.items()]) if attrs_s: attrs_s = ' ' + attrs_s - + return '<%s class="lista %s %s"%s>' % (listtag, ltype, classes, attrs_s), '' % listtag def handle_punkt(self, element): @@ -129,7 +130,7 @@ class EduModule(Xmill): def handle_rdf__RDF(self, _): # ustal w opcjach rzeczy :D - return + return class Excercise(EduModule): @@ -137,6 +138,9 @@ class Excercise(EduModule): self.question_counter = 0 super(Excercise, self).__init__(*args, **kw) + def handle_rozw_kom(self, element): + return None + def handle_cwiczenie(self, element): self.options = {'excercise': element.attrib['typ']} self.question_counter = 0 @@ -161,19 +165,26 @@ class Excercise(EduModule): pre = pre + qpre post = qpost + post return pre, post - + def handle_pytanie(self, element): """This will handle element, when there is no """ + add_class = "" self.question_counter += 1 self.piece_counter = 0 solution = element.attrib.get('rozw', None) if solution: solution_s = ' data-solution="%s"' % solution else: solution_s = '' - return '
' %\ - (self.question_counter, solution_s), \ - "
" + handles = element.attrib.get('uchwyty', None) + if handles: + add_class += ' handles handles-%s' % handles + self.options = {'handles': handles} + + + return '
' %\ + (add_class, self.question_counter, solution_s), \ + "
" class Wybor(Excercise): @@ -183,8 +194,9 @@ class Wybor(Excercise): self.piece_counter += 1 no = self.piece_counter eid = "q%(qc)d_%(no)d" % locals() + aname = element.attrib.get('nazwa', None) return u""" -
  • +
  • " @@ -194,15 +206,18 @@ class Wybor(Excercise): class Uporzadkuj(Excercise): - def handle_cwiczenie(self, element): - pre, post = super(Uporzadkuj, self).handle_cwiczenie(element) + def handle_pytanie(self, element): + """ +Overrides the returned content default handle_pytanie + """ + # we ignore the result, returning our own + super(Uporzadkuj, self).handle_pytanie(element) order_items = element.xpath(".//punkt/@rozw") - if order_items == []: pdb.set_trace() - return pre + u"""
    """ % \ - ','.join(order_items), \ - u"""
    """ + post - + return u"""
    """ % \ + (','.join(order_items), self.question_counter), \ + u"""
    """ + def handle_punkt(self, element): return """
  • """ \ % element.attrib,\ @@ -210,19 +225,53 @@ class Uporzadkuj(Excercise): class Luki(Excercise): + def find_pieces(self, question): + return question.xpath("//luka") + + def solution_html(self, piece): + return piece.text + ''.join( + [etree.tostring(n, encoding=unicode) + for n in piece]) + + def handle_pytanie(self, element): + qpre, qpost = super(Luki, self).handle_pytanie(element) + + luki = list(enumerate(self.find_pieces(element))) + luki_html = "" + i = 0 + random.shuffle(luki) + for (i, luka) in luki: + i += 1 + luka_html = self.solution_html(luka) + luki_html += u'%s' % (i, luka_html) + self.words_html = '
    %s
    ' % luki_html + + return qpre, qpost + + def handle_opis(self, element): + pre, post = super(Luki, self).handle_opis(element) + return pre, self.words_html + post + def handle_luka(self, element): - return '' % element.text + self.piece_counter += 1 + return '' % self.piece_counter + +class Zastap(Luki): + def find_pieces(self, question): + return question.xpath("//zastap") + def solution_html(self, piece): + return piece.attrib['rozw'] -class Zastap(Excercise): def handle_zastap(self, element): - return '' % element.attrib, '' + self.piece_counter += 1 + return '' \ + % self.piece_counter, '' class Przyporzadkuj(Excercise): def handle_lista(self, lista): - print "in lista %s %s" % (lista.attrib, self.options) if 'nazwa' in lista.attrib: attrs = { 'data-name': lista.attrib['nazwa'], @@ -237,20 +286,35 @@ class Przyporzadkuj(Excercise): self.options = {'subject': True} else: attrs = {} - return super(Przyporzadkuj, self).handle_lista(lista, attrs) - + pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs) + return pre, post + '
    ' def handle_punkt(self, element): - print "in punkt %s %s" % (element.attrib, self.options) - if self.options['subject']: - return '
  • ' % element.attrib, '
  • ' + self.piece_counter += 1 + if self.options['handles']: + return '
  • %s' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '
  • ' + else: + return '
  • ' % (element.attrib['rozw'], self.piece_counter), '
  • ' + elif self.options['predicate']: - return '
  • ' % element.attrib, '
    • Placeholder
  • ' + placeholders = u'
  • ' + return '
  • ' % element.attrib, '
      ' + placeholders + '
  • ' + else: return super(Przyporzadkuj, self).handle_punkt(element) +class PrawdaFalsz(Excercise): + def handle_punkt(self, element): + if 'rozw' in element.attrib: + return u'''
  • + + Prawda + Fałsz + ''' % {'prawda': 'true', 'falsz': 'false'}[element.attrib['rozw']], '
  • ' + else: + return super(PrawdaFalsz, self).handle_punkt(element) def transform(wldoc, stylesheet='edumed', options=None, flags=None): @@ -260,7 +324,6 @@ def transform(wldoc, stylesheet='edumed', options=None, flags=None): otherwise returns True if file has been written,False if it hasn't. File won't be written if it has no content. """ - edumod = EduModule(options) # from pdb import set_trace; set_trace() html = edumod.generate(wldoc.edoc.getroot())