X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/ea995d6aea1cc1b19502825fec5f5d0445d632c4..63cfa40372a9d33c84c0e4b61ed505173c780eae:/librarian/pyhtml.py?ds=inline diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py index 775def1..1043f4f 100644 --- a/librarian/pyhtml.py +++ b/librarian/pyhtml.py @@ -9,12 +9,15 @@ from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close from librarian import functions import re import random +from copy import deepcopy +IMAGE_THUMB_WIDTH = 300 class EduModule(Xmill): def __init__(self, options=None): super(EduModule, self).__init__(options) self.activity_counter = 0 + self.activity_last = None self.exercise_counter = 0 # text filters @@ -23,7 +26,7 @@ class EduModule(Xmill): txt = txt.replace("/\n", "
\n") return txt self.register_text_filter(functions.substitute_entities) - self.register_text_filter(swap_endlines) + self.register_escaped_text_filter(swap_endlines) @tagged('div', 'stanza') def handle_strofa(self, element): @@ -45,7 +48,7 @@ class EduModule(Xmill): handle_podtytul = tag("span", "subtitle") handle_naglowek_akt = handle_naglowek_czesc = handle_srodtytul = tag("h2") handle_naglowek_scena = tag('h2') - handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3') + handle_naglowek_osoba = tag('h3') handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph') handle_wyroznienie = tag('em') @@ -53,7 +56,7 @@ class EduModule(Xmill): handle_slowo_obce = tag('em', 'foreign') def naglowek_to_anchor(self, naglowek): - return re.sub(r" +", " ", naglowek.text.strip()) + return self.options['urlmapper'].naglowek_to_anchor(naglowek) def handle_nazwa_utworu(self, element): toc = [] @@ -65,11 +68,19 @@ class EduModule(Xmill): toc.append("
  • %s
    • " % atxt) toc = "" % "".join(toc) add_header = "Lekcja: " if self.options['wldoc'].book_info.type in ('course', 'synthetic') else '' - return "

    %s" % add_header, "

    " + toc + return "

    %s" % add_header, "

    " + toc - @tagged("h2") def handle_naglowek_rozdzial(self, element): - return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element))) + return_to_top = u"wróć do spisu treści" + pre, post = tag_open_close("h2", id=self.naglowek_to_anchor(element)) + url = self.options['urlmapper'].get_help_url(element) + if url: + post = " ?" % (url,) + post + return return_to_top + pre, post + + def handle_naglowek_podrozdzial(self, element): + self.activity_counter = 0 + return tag('h3')(self, element) def handle_uwaga(self, _e): return None @@ -82,7 +93,10 @@ class EduModule(Xmill): } submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items())) - opis = submill.generate(element.xpath('opis')[0]) if len(element.xpath('opis')) else "" + if element.xpath('opis'): + opis = submill.generate(element.xpath('opis')[0]) + else: + opis = '' n = element.xpath('wskazowki') if n: wskazowki = submill.generate(n[0]) @@ -94,21 +108,42 @@ class EduModule(Xmill): else: pomoce = '' forma = ''.join(element.xpath('forma/text()')) + get_forma_url = self.options['urlmapper'].get_forma_url + forms = [] + for form_name in forma.split(','): + name = form_name.strip() + url = get_forma_url(name) + if url: + forms.append("%s" % (url, name)) + else: + forms.append(name) + forma = ', '.join(forms) + if forma: + forma = '

    Metoda

    %s

    ' % forma czas = ''.join(element.xpath('czas/text()')) + if czas: + czas = '

    Czas

    %s min

    ' % czas counter = self.activity_counter + if element.getnext().tag == 'aktywnosc' or self.activity_last.getnext() == element: + counter_html = """%(counter)d.""" % locals() + else: + counter_html = '' + + self.activity_last = element + return u"""
    - %(counter)d. + %(counter_html)s %(opis)s""" % locals(), \ u"""%(wskazowki)s
    @@ -148,16 +183,23 @@ u"""%(wskazowki)s # Lists def handle_lista(self, element, attrs={}): ltype = element.attrib.get('typ', 'punkt') + if not element.findall("punkt"): + if ltype == 'czytelnia': + return '

    W przygotowaniu.

    ' + else: + return None if ltype == 'slowniczek': surl = element.attrib.get('src', None) if surl is None: # print '** missing src on , setting default' - surl = 'http://edukacjamedialna.edu.pl/slowniczek' - sxml = None - if surl: - sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string()) + surl = 'http://edukacjamedialna.edu.pl/lekcje/slowniczek/' + sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string()) + self.options = {'slowniczek': True, 'slowniczek_xml': sxml } - return '
    ', '
    ' + pre, post = '
    ', '
    ' + if not self.options['wldoc'].book_info.url.slug.startswith('slowniczek'): + post += u'

    Zobacz cały słowniczek.

    ' % surl + return pre, post listtag = {'num': 'ol', 'punkt': 'ul', @@ -189,16 +231,19 @@ u"""%(wskazowki)s # let's pull definiens from another document if self.options['slowniczek_xml'] is not None and (nxt is None or nxt.tag != 'definiens'): sxml = self.options['slowniczek_xml'] - defloc = sxml.xpath("//definiendum[text()='%s']" % element.text) + if "'" in (element.text or ''): + defloc = sxml.xpath("//definiendum[text()=\"%s\"]" % (element.text or '').strip()) + else: + defloc = sxml.xpath("//definiendum[text()='%s']" % (element.text or '').strip()) if defloc: definiens = defloc[0].getnext() if definiens.tag == 'definiens': subgen = EduModule(self.options) definiens_s = subgen.generate(definiens) else: - pass # print '!! Missing definiendum in source:', element.text + print "!! Missing definiendum in source: '%s'" % element.text - return u"
    ", u"
    " + definiens_s + return u"
    " % self.naglowek_to_anchor(element), u"
    " + definiens_s def handle_definiens(self, element): return u"
    ", u"
    " @@ -255,13 +300,45 @@ u"""%(wskazowki)s return u"" % def_href, u'%s%s' % (def_err, more_links) + def handle_obraz(self, element): + name = element.attrib.get('nazwa', '').strip() + if not name: + print '!! missing "nazwa"' + return + alt = element.attrib.get('alt', '') + if not alt: + print '** missing "alt"' + slug, ext = name.rsplit('.', 1) + url = self.options['urlmapper'].url_for_image(slug, ext) + thumb_url = self.options['urlmapper'].url_for_image(slug, ext, IMAGE_THUMB_WIDTH) + e = etree.Element("a", attrib={"href": url, "class": "image"}) + e.append(etree.Element("img", attrib={"src": thumb_url, "alt": alt, + "width": str(IMAGE_THUMB_WIDTH)})) + return etree.tostring(e, encoding=unicode), u"" + + def handle_video(self, element): + url = element.attrib.get('url') + if not url: + print '!!
    " + def get_instruction(self): + if not self.instruction_printed: + self.instruction_printed = True + if self.INSTRUCTION: + return u'%s' % self.INSTRUCTION + else: + return "" + else: + return "" + + class Wybor(Exercise): def handle_cwiczenie(self, element): @@ -340,7 +428,7 @@ class Wybor(Exercise): break choices = p.xpath(".//*[@nazwa]") uniq = set() - for n in choices: uniq.add(n.attrib['nazwa']) + for n in choices: uniq.add(n.attrib.get('nazwa', '')) if len(choices) != len(uniq): is_single_choice = False break @@ -373,6 +461,8 @@ class Wybor(Exercise): class Uporzadkuj(Exercise): + INSTRUCTION = u"Kliknij wybraną odpowiedź i przeciągnij w nowe miejsce." + def handle_pytanie(self, element): """ Overrides the returned content default handle_pytanie @@ -386,22 +476,21 @@ Overrides the returned content default handle_pytanie u"""""" def handle_punkt(self, element): - return """
  • """ \ + return """
  • """ \ % element.attrib,\ "
    • " class Luki(Exercise): + INSTRUCTION = u"Przeciągnij odpowiedzi i upuść w wybranym polu." def find_pieces(self, question): return question.xpath(".//luka") def solution_html(self, piece): + piece = deepcopy(piece) + piece.tail = None sub = EduModule() return sub.generate(piece) - # print piece.text - # 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) @@ -427,11 +516,13 @@ class Luki(Exercise): class Zastap(Luki): + INSTRUCTION = u"Przeciągnij odpowiedzi i upuść je na słowie lub wyrażeniu, które chcesz zastąpić." + def find_pieces(self, question): return question.xpath(".//zastap") def solution_html(self, piece): - return piece.attrib['rozw'] + return piece.attrib.get('rozw', '') def handle_zastap(self, element): self.piece_counter += 1 @@ -440,6 +531,23 @@ class Zastap(Luki): class Przyporzadkuj(Exercise): + INSTRUCTION = [u"Przeciągnij odpowiedzi i upuść w wybranym polu.", + u"Kliknij numer odpowiedzi, przeciągnij i upuść w wybranym polu."] + + def get_instruction(self): + if not self.instruction_printed: + self.instruction_printed = True + return u'%s' % self.INSTRUCTION[self.options['handles'] and 1 or 0] + else: + return "" + + def handle_cwiczenie(self, element): + pre, post = super(Przyporzadkuj, self).handle_cwiczenie(element) + lista_with_handles = element.xpath(".//*[@uchwyty]") + if lista_with_handles: + self.options = {'handles': True} + return pre, post + def handle_pytanie(self, element): pre, post = super(Przyporzadkuj, self).handle_pytanie(element) minimum = element.attrib.get("min", None) @@ -459,7 +567,9 @@ class Przyporzadkuj(Exercise): 'data-target': lista.attrib['cel'], 'class': 'subject' } - self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib} + if lista.attrib.get('krotkie'): + self.options = {'short': True} + self.options = {'subject': True} else: attrs = {} pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs) @@ -469,16 +579,19 @@ class Przyporzadkuj(Exercise): if self.options['subject']: self.piece_counter += 1 if self.options['handles']: - return '
  • %s' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '
    • ' + return '
  • %s' % (element.attrib.get('rozw', ''), self.piece_counter, self.piece_counter), '
    • ' else: - return '
  • ' % (element.attrib.get('rozw', ''), self.piece_counter), '
    • ' + extra_class = "" + if self.options['short']: + extra_class += ' short' + return '
  • ' % (element.attrib.get('rozw', ''), self.piece_counter, extra_class), '
    • ' elif self.options['predicate']: if self.options['min']: - placeholders = u'
  • ' * self.options['min'] + placeholders = u'
  • ' * self.options['min'] else: - placeholders = u'
  • ' - return '
  • ' % element.attrib.get('nazwa', ''), '
    • ' + placeholders = u'
  • ' + return '
  • ' % element.attrib.get('nazwa', ''), '
    • ' else: return super(Przyporzadkuj, self).handle_punkt(element) @@ -528,14 +641,29 @@ class EduModuleFormat(Format): order = dict(reversed(k) for k in enumerate(self.PRIMARY_MATERIAL_FORMATS)) mats = self.materials_by_slug.get(slug, {}).items() if not mats: - pass # print "!! Material missing: '%s'" % slug + print "!! Material missing: '%s'" % slug return sorted(mats, key=lambda (x, y): order.get(x, x)) def url_for_material(self, slug, fmt): return "%s.%s" % (slug, fmt) + def url_for_image(self, slug, fmt, width=None): + return self.url_for_material(self, slug, fmt) + + def text_to_anchor(self, text): + return re.sub(r" +", " ", text) + + def naglowek_to_anchor(self, naglowek): + return self.text_to_anchor(naglowek.text.strip()) + + def get_forma_url(self, forma): + return None + + def get_help_url(self, naglowek): + return None + -def transform(wldoc, stylesheet='edumed', options=None, flags=None): +def transform(wldoc, stylesheet='edumed', options=None, flags=None, verbose=None): """Transforms the WL document to XHTML. If output_filename is None, returns an XML,