From 076474d2a928649c934b4bb12031d39cdea2c77d Mon Sep 17 00:00:00 2001 From: Library Admin Date: Wed, 5 Jun 2013 11:53:50 +0200 Subject: [PATCH] merge ofop-red branch which should not be necessary any more --- librarian/cover.py | 5 +- librarian/pyhtml.py | 151 ++++++++------------------------------------ 2 files changed, 31 insertions(+), 125 deletions(-) diff --git a/librarian/cover.py b/librarian/cover.py index 7343e68..dc64a9c 100644 --- a/librarian/cover.py +++ b/librarian/cover.py @@ -121,7 +121,10 @@ class Cover(object): } def __init__(self, book_info, format=None): - self.author = ", ".join(auth.readable() for auth in book_info.authors) + try: + self.author = ", ".join(auth.readable() for auth in book_info.authors) + except AttributeError: + self.author = "" self.title = book_info.title if format is not None: self.format = format diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py index 900d068..6db1701 100644 --- a/librarian/pyhtml.py +++ b/librarian/pyhtml.py @@ -9,26 +9,12 @@ 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 - -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): super(EduModule, self).__init__(options) self.activity_counter = 0 - self.activity_last = None self.exercise_counter = 0 # text filters @@ -37,7 +23,7 @@ class EduModule(Xmill): txt = txt.replace("/\n", "
\n") return txt self.register_text_filter(functions.substitute_entities) - self.register_escaped_text_filter(swap_endlines) + self.register_text_filter(swap_endlines) @tagged('div', 'stanza') def handle_strofa(self, element): @@ -59,33 +45,31 @@ 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 = tag('h3') + handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3') handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph') handle_wyroznienie = tag('em') handle_tytul_dziela = tag('em', 'title') handle_slowo_obce = tag('em', 'foreign') + def naglowek_to_anchor(self, naglowek): + return re.sub(r" +", " ", naglowek.text.strip()) + 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) 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_to_top = u"wróć do spisu treści" - pre, post = tag_open_close("h2", id=naglowek_to_anchor(element)) - return return_to_top + pre, post - - def handle_naglowek_podrozdzial(self, element): - self.activity_counter = 0 - return tag('h3')(self, element) + return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element))) def handle_uwaga(self, _e): return None @@ -118,17 +102,10 @@ class EduModule(Xmill): 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_html)s + %(counter)d. %(opis)s""" % locals(), \ u"""%(wskazowki)s
    @@ -174,24 +151,16 @@ 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/lekcje/slowniczek/' + surl = 'http://edukacjamedialna.edu.pl/slowniczek' sxml = None if surl: 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': - post += u'

    Zobacz cały słowniczek.

    ' % surl - return pre, post + return '
    ', '
    ' listtag = {'num': 'ol', 'punkt': 'ul', @@ -289,45 +258,13 @@ 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): @@ -411,13 +337,13 @@ class Wybor(Exercise): if not pytania: pytania = [element] for p in pytania: - solutions = re.split(r"[, ]+", p.attrib.get('rozw', '')) + solutions = re.split(r"[, ]+", p.attrib['rozw']) if len(solutions) != 1: is_single_choice = False 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['nazwa']) if len(choices) != len(uniq): is_single_choice = False break @@ -450,8 +376,6 @@ 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 @@ -465,21 +389,22 @@ 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) @@ -505,13 +430,11 @@ 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.get('rozw', '') + return piece.attrib['rozw'] def handle_zastap(self, element): self.piece_counter += 1 @@ -520,23 +443,6 @@ 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) @@ -556,7 +462,7 @@ class Przyporzadkuj(Exercise): 'data-target': lista.attrib['cel'], 'class': 'subject' } - self.options = {'subject': True} + self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib} else: attrs = {} pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs) @@ -566,16 +472,16 @@ 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['rozw'], self.piece_counter, self.piece_counter), '
    • ' else: - return '
  • ' % (element.attrib.get('rozw', ''), self.piece_counter), '
    • ' + return '
  • ' % (element.attrib['rozw'], self.piece_counter), '
    • ' 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, '
    • ' else: return super(Przyporzadkuj, self).handle_punkt(element) @@ -631,9 +537,6 @@ class EduModuleFormat(Format): 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 transform(wldoc, stylesheet='edumed', options=None, flags=None): """Transforms the WL document to XHTML. -- 2.20.1