X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/b0224a1763fd71c1c9ed19e7663d94106a513dc8..b575a407e307dbf28f9f3347e9f130c31569cfe6:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 88e1194..c039ab8 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -16,7 +16,7 @@ class EduModule(Xmill):
def __init__(self, options=None):
super(EduModule, self).__init__(options)
self.activity_counter = 0
- self.register_text_filter(lambda t: functions.substitute_entities(None, t))
+ self.register_text_filter(functions.substitute_entities)
def handle_powiesc(self, element):
return u"""
@@ -33,8 +33,8 @@ class EduModule(Xmill):
handle_dzielo_nadrzedne = tag("span", "collection")
handle_podtytul = tag("span", "subtitle")
handle_naglowek_akt = handle_naglowek_czesc = handle_srodtytul = tag("h2")
- handle_naglowek_scena = handle_naglowek_rozdzial = tag('h3')
- handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h4')
+ handle_naglowek_scena = handle_naglowek_rozdzial = tag('h2')
+ handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3')
handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph')
handle_strofa = tag('div', 'stanza')
@@ -42,9 +42,9 @@ class EduModule(Xmill):
self.activity_counter += 1
self.options = {
'activity': True,
- 'activity_counter': self.activity_counter
+ 'activity_counter': self.activity_counter,
}
- submill = EduModule(self.options)
+ submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items()))
opis = submill.generate(element.xpath('opis')[0])
@@ -65,26 +65,27 @@ class EduModule(Xmill):
return u"""
-
%(counter)d.
+
+ %(counter)d.
%(opis)s
%(wskazowki)s
-
-
Czas: %(czas)s min
-
Forma: %(forma)s
+
+
""" % locals()
- handle_opis = ifoption(activity=False)(tag('div', 'description'))
- handle_wskazowki = ifoption(activity=False)(tag('div', ('hints', 'teacher')))
+ handle_opis = ifoption(sub_gen=True)(tag('div', 'description'))
+ handle_wskazowki = ifoption(sub_gen=True)(tag('div', ('hints', 'teacher')))
- @ifoption(activity=False)
- @tagged('div', 'materials')
+ @ifoption(sub_gen=True)
+ @tagged('section', 'infobox materials')
def handle_pomoce(self, _):
- return "Pomoce: ", ""
+ return """
Pomoce
""", ""
def handle_czas(self, *_):
return
@@ -113,7 +114,7 @@ class EduModule(Xmill):
surl = element.attrib.get('href', None)
sxml = None
if surl:
- sxml = etree.fromstring(self.provider.by_uri(surl).get_string())
+ sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
self.options = {'slowniczek': True, 'slowniczek_xml': sxml }
return '
', '
'
@@ -143,9 +144,10 @@ class EduModule(Xmill):
# let's pull definiens from another document
if self.options['slowniczek_xml'] and (not nxt or nxt.tag != 'definiens'):
sxml = self.options['slowniczek_xml']
- defloc = sxml.xpath("//definiendum[content()='%s']" % element.text)
+ assert element.text != ''
+ defloc = sxml.xpath("//definiendum[text()='%s']" % element.text)
if defloc:
- definiens = defloc.getnext()
+ definiens = defloc[0].getnext()
if definiens.tag == 'definiens':
subgen = EduModule(self.options)
definiens_s = subgen.generate(definiens)
@@ -176,7 +178,9 @@ class EduModule(Xmill):
return
def handle_link(self, element):
- if 'material' in element.attrib:
+ if 'url' in element.attrib:
+ return tag('a', href=element.attrib['url'])(element)
+ elif 'material' in element.attrib:
formats = re.split(r"[, ]+", element.attrib['format'])
fmt_links = []
for f in formats:
@@ -301,7 +305,7 @@ Overrides the returned content default handle_pytanie
class Luki(Exercise):
def find_pieces(self, question):
- return question.xpath("//luka")
+ return question.xpath(".//luka")
def solution_html(self, piece):
return piece.text + ''.join(
@@ -324,8 +328,7 @@ class Luki(Exercise):
return qpre, qpost
def handle_opis(self, element):
- pre, post = super(Luki, self).handle_opis(element)
- return pre, self.words_html + post
+ return '', self.words_html
def handle_luka(self, element):
self.piece_counter += 1
@@ -334,7 +337,7 @@ class Luki(Exercise):
class Zastap(Luki):
def find_pieces(self, question):
- return question.xpath("//zastap")
+ return question.xpath(".//zastap")
def solution_html(self, piece):
return piece.attrib['rozw']