X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/8e08d50cdbe864bdb95f52bcadc7028fc2f9c816..f1ae0a40b774ad7260e7449986764c9104553e03:/librarian/pyhtml.py diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py index 21132b6..38e0829 100644 --- a/librarian/pyhtml.py +++ b/librarian/pyhtml.py @@ -4,7 +4,7 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from lxml import etree -from librarian import IOFile, RDFNS, DCNS, Format +from librarian import IOFile, Format from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close from librarian import functions import re @@ -13,14 +13,6 @@ from copy import deepcopy IMAGE_THUMB_WIDTH = 300 -try: - from fnpdjango.utils.text.slughifi import slughifi - def naglowek_to_anchor(naglowek): - return slughifi(naglowek.text) -except ImportError: - from urllib import quote - def naglowek_to_anchor(naglowek): - return quote(re.sub(r" +", " ", naglowek.text.strip())) class EduModule(Xmill): def __init__(self, options=None): @@ -64,11 +56,14 @@ class EduModule(Xmill): handle_tytul_dziela = tag('em', 'title') handle_slowo_obce = tag('em', 'foreign') + def naglowek_to_anchor(self, naglowek): + return self.options['urlmapper'].naglowek_to_anchor(naglowek) + def handle_nazwa_utworu(self, element): toc = [] for naglowek in element.getparent().findall('.//naglowek_rozdzial'): a = etree.Element("a") - a.attrib["href"] = "#" + naglowek_to_anchor(naglowek) + a.attrib["href"] = "#" + self.naglowek_to_anchor(naglowek) a.text = naglowek.text atxt = etree.tostring(a, encoding=unicode) toc.append("
  • %s
    • " % atxt) @@ -78,7 +73,10 @@ class EduModule(Xmill): def handle_naglowek_rozdzial(self, element): return_to_top = u"wróć do spisu treści" - pre, post = tag_open_close("h2", id=naglowek_to_anchor(element)) + 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): @@ -102,42 +100,60 @@ class EduModule(Xmill): opis = '' n = element.xpath('wskazowki') - if n: wskazowki = submill.generate(n[0]) - - else: wskazowki = '' + if n: + wskazowki = submill.generate(n[0]) + else: + wskazowki = '' n = element.xpath('pomoce') - if n: pomoce = submill.generate(n[0]) - else: pomoce = '' + if n: + pomoce = submill.generate(n[0]) + 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() + if element.getnext().tag == 'aktywnosc' or (len(self.activity_last) and self.activity_last.getnext() == element): + counter_html = """%(counter)d.""" % {'counter': counter} else: counter_html = '' self.activity_last = element - return u""" + return ( + u"""
    -
    - %(counter_html)s - %(opis)s""" % locals(), \ -u"""%(wskazowki)s -
    - -
    +
    + %(counter_html)s + %(opis)s""" % {'counter_html': counter_html, 'opis': opis}, + u"""%(wskazowki)s +
    + +
    -""" % locals() +""" % {'wskazowki': wskazowki, 'czas': czas, 'forma': forma, 'pomoce': pomoce}) handle_opis = ifoption(sub_gen=True)(tag('div', 'description')) handle_wskazowki = ifoption(sub_gen=True)(tag('div', ('hints', 'teacher'))) @@ -170,7 +186,9 @@ u"""%(wskazowki)s return handler.generate(element) # Lists - def handle_lista(self, element, attrs={}): + def handle_lista(self, element, attrs=None): + if attrs is None: + attrs = {} ltype = element.attrib.get('typ', 'punkt') if not element.findall("punkt"): if ltype == 'czytelnia': @@ -182,25 +200,27 @@ u"""%(wskazowki)s if surl is None: # print '** missing src on , setting default' surl = 'http://edukacjamedialna.edu.pl/lekcje/slowniczek/' - sxml = None - if surl: - sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string()) - self.options = {'slowniczek': True, 'slowniczek_xml': sxml } + sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string()) + + self.options = {'slowniczek': True, 'slowniczek_xml': sxml} pre, post = '
    ', '
    ' - if self.options['wldoc'].book_info.url.slug != 'slowniczek': + 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', - 'alfa': 'ul', - 'czytelnia': 'ul'}[ltype] + listtag = { + 'num': 'ol', + 'punkt': 'ul', + 'alfa': 'ul', + 'czytelnia': 'ul'}[ltype] classes = attrs.get('class', '') - if classes: del attrs['class'] + if classes: + del attrs['class'] attrs_s = ' '.join(['%s="%s"' % kv for kv in attrs.items()]) - if attrs_s: attrs_s = ' ' + attrs_s + if attrs_s: + attrs_s = ' ' + attrs_s return '<%s class="lista %s %s"%s>' % (listtag, ltype, classes, attrs_s), '' % listtag @@ -221,16 +241,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: - print '!! Missing definiendum in source:', element.text + print ("!! Missing definiendum in source: '%s'" % element.text).encode('utf-8') - return u"
    ", u"
    " + definiens_s + return u"
    " % self.naglowek_to_anchor(element), u"
    " + definiens_s def handle_definiens(self, element): return u"
    ", u"
    " @@ -240,8 +263,7 @@ u"""%(wskazowki)s def handle_tabela(self, element): has_frames = int(element.attrib.get("ramki", "0")) - if has_frames: frames_c = "framed" - else: frames_c = "" + frames_c = "framed" if has_frames else "" return u"""""" % frames_c, u"
    " def handle_wiersz(self, element): @@ -260,14 +282,9 @@ u"""%(wskazowki)s elif 'material' in element.attrib: material_err = u' [BRAKUJĄCY MATERIAŁ]' slug = element.attrib['material'] - make_url = lambda f: self.options['urlmapper'] \ - .url_for_material(slug, f) - if 'format' in element.attrib: - formats = re.split(r"[, ]+", - element.attrib['format']) - else: - formats = [None] + def make_url(f): + return self.options['urlmapper'].url_for_material(slug, f) formats = self.options['urlmapper'].materials(slug) @@ -299,8 +316,10 @@ u"""%(wskazowki)s 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)})) + 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): @@ -318,10 +337,12 @@ u"""%(wskazowki)s class Exercise(EduModule): INSTRUCTION = "" + def __init__(self, *args, **kw): self.question_counter = 0 super(Exercise, self).__init__(*args, **kw) self.instruction_printed = False + self.piece_counter = None @tagged('div', 'description') def handle_opis(self, element): @@ -362,7 +383,7 @@ class Exercise(EduModule): # Add a single tag if it's not there if not element.xpath(".//pytanie"): qpre, qpost = self.handle_pytanie(element) - pre = pre + qpre + pre += qpre post = qpost + post return pre, post @@ -373,8 +394,7 @@ class Exercise(EduModule): 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 = '' + solution_s = ' data-solution="%s"' % solution if solution else '' handles = element.attrib.get('uchwyty', None) if handles: @@ -382,8 +402,7 @@ class Exercise(EduModule): self.options = {'handles': handles} minimum = element.attrib.get('min', None) - if minimum: minimum_s = ' data-minimum="%d"' % int(minimum) - else: minimum_s = '' + minimum_s = ' data-minimum="%d"' % int(minimum) if minimum else '' return '
    ' %\ (add_class, self.question_counter, solution_s + minimum_s), \ @@ -400,7 +419,6 @@ class Exercise(EduModule): return "" - class Wybor(Exercise): def handle_cwiczenie(self, element): pre, post = super(Wybor, self).handle_cwiczenie(element) @@ -415,7 +433,8 @@ class Wybor(Exercise): break choices = p.xpath(".//*[@nazwa]") uniq = set() - for n in choices: uniq.add(n.attrib.get('nazwa', '')) + for n in choices: + uniq.add(n.attrib.get('nazwa', '')) if len(choices) != len(uniq): is_single_choice = False break @@ -470,6 +489,7 @@ Overrides the returned content default handle_pytanie class Luki(Exercise): INSTRUCTION = u"Przeciągnij odpowiedzi i upuść w wybranym polu." + def find_pieces(self, question): return question.xpath(".//luka") @@ -554,6 +574,8 @@ class Przyporzadkuj(Exercise): 'data-target': lista.attrib['cel'], 'class': 'subject' } + if lista.attrib.get('krotkie'): + self.options = {'short': True} self.options = {'subject': True} else: attrs = {} @@ -564,16 +586,29 @@ class Przyporzadkuj(Exercise): if self.options['subject']: self.piece_counter += 1 if self.options['handles']: - return '
  • %s' % (element.attrib.get('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'] else: placeholders = u'
  • ' - return '
  • ' % element.attrib.get('nazwa', ''), '
      ' + placeholders + '
    • ' + return ( + '
  • ' % element.attrib.get('nazwa', ''), + '
      ' + placeholders + '
    • ') else: return super(Przyporzadkuj, self).handle_punkt(element) @@ -599,6 +634,7 @@ class EduModuleFormat(Format): def __init__(self, wldoc, **kwargs): super(EduModuleFormat, self).__init__(wldoc, **kwargs) + self.materials_by_slug = None def build(self): # Sort materials by slug. @@ -620,17 +656,30 @@ class EduModuleFormat(Format): def materials(self, slug): """Returns a list of pairs: (ext, iofile).""" - order = dict(reversed(k) for k in enumerate(self.PRIMARY_MATERIAL_FORMATS)) + order = {pmf: i for (i, pmf) 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).encode('utf-8') return sorted(mats, key=lambda (x, y): order.get(x, x)) def url_for_material(self, slug, fmt): return "%s.%s" % (slug, fmt) + # WTF: tutaj był błąd, ale nikomu to nie przeszkadzało? def url_for_image(self, slug, fmt, width=None): - return self.url_for_material(self, slug, fmt) + return self.url_for_material(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, verbose=None):