import random
+DEFAULT_MATERIAL_FORMAT = 'odt'
+
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"""
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')
+ handle_wyroznienie = tag('em')
+ handle_tytul_dziela = tag('em', 'title')
+ handle_slowo_obce = tag('em', 'foreign')
+
+ def handle_uwaga(self, _e):
+ return None
def handle_aktywnosc(self, element):
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])
return u"""
<div class="activity">
- <div class="text">%(counter)d.
+ <div class="text">
+ <span class="act_counter">%(counter)d.</span>
%(opis)s
%(wskazowki)s
</div>
- <div class="info">
- <p>Czas: %(czas)s min</p>
- <p>Forma: %(forma)s</p>
+ <aside class="info">
+ <section class="infobox time"><h1>Czas</h1><p>%(czas)s min</p></section>
+ <section class="infobox kind"><h1>Forma</h1><p>%(forma)s</p></section>
%(pomoce)s
- </div>
+ </aside>
<div class="clearboth"></div>
</div>
""" % 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 """<h1>Pomoce</h1>""", ""
def handle_czas(self, *_):
return
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 '<div class="slowniczek">', '</div>'
# 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)
def handle_definiens(self, element):
return u"<dd>", u"</dd>"
-
def handle_podpis(self, element):
return u"""<div class="caption">""", u"</div>"
return
def handle_link(self, element):
- if 'material' in element.attrib:
- formats = re.split(r"[, ]+", element.attrib['format'])
+ if 'url' in element.attrib:
+ return tag('a', href=element.attrib['url'])(self, element)
+ elif 'material' in element.attrib:
+ formats = re.split(r"[, ]+",
+ element.attrib.get('format', DEFAULT_MATERIAL_FORMAT))
+ make_url = lambda f: self.options['urlmapper'] \
+ .url_for_material(element.attrib['material'], f)
+ def_href = make_url(formats[0])
fmt_links = []
- for f in formats:
- fmt_links.append(u'<a href="%s">%s</a>' % (self.options['urlmapper'].url_for_material(element.attrib['material'], f), f.upper()))
+ for f in formats[1:]:
+ fmt_links.append(u'<a href="%s">%s</a>' % (make_url(f), f.upper()))
- return u"", u' (%s)' % u' '.join(fmt_links)
+ return u"<a href='%s'>" % def_href, u'</a> (%s)' % u' '.join(fmt_links)
class Exercise(EduModule):
self.question_counter = 0
super(Exercise, self).__init__(*args, **kw)
+ handle_opis = tag('div', 'description')
+
def handle_rozw_kom(self, element):
return u"""<div style="display:none" class="comment">""", u"""</div>"""
if len(solutions) != 1:
is_single_choice = False
break
+ choices = element.xpath(".//*[@nazwa]")
+ uniq = set()
+ for n in choices: uniq.add(n.attrib['nazwa'])
+ if len(choices) != len(uniq):
+ is_single_choice = False
+ break
+
self.options = {'single': is_single_choice}
return pre, post
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(
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
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']
if self.options['subject']:
self.piece_counter += 1
if self.options['handles']:
- return '<li><span data-solution="%s" data-no="%s" class="question-piece draggable handle">%s</span>' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '</li>'
+ return '<li><span data-solution="%s" data-no="%s" class="question-piece draggable handle add-li">%s</span>' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '</li>'
else:
return '<li data-solution="%s" data-no="%s" class="question-piece draggable">' % (element.attrib['rozw'], self.piece_counter), '</li>'
fnp / librarian.git / blobdiff