X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/b575a407e307dbf28f9f3347e9f130c31569cfe6..f921a036ff55ff3a43ad2c93c8d8eb808fd54724:/librarian/pyhtml.py?ds=sidebyside
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index c039ab8..6aeada9 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -11,6 +11,8 @@ import re
import random
+DEFAULT_MATERIAL_FORMAT = 'odt'
+
class EduModule(Xmill):
def __init__(self, options=None):
@@ -37,6 +39,12 @@ class EduModule(Xmill):
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
@@ -157,7 +165,6 @@ class EduModule(Xmill):
def handle_definiens(self, element):
return u"
", u""
-
def handle_podpis(self, element):
return u"""""", u"
"
@@ -179,14 +186,18 @@ class EduModule(Xmill):
def handle_link(self, element):
if 'url' in element.attrib:
- return tag('a', href=element.attrib['url'])(element)
+ return tag('a', href=element.attrib['url'])(self, element)
elif 'material' in element.attrib:
- formats = re.split(r"[, ]+", element.attrib['format'])
+ 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'%s' % (self.options['urlmapper'].url_for_material(element.attrib['material'], f), f.upper()))
+ for f in formats[1:]:
+ fmt_links.append(u'%s' % (make_url(f), f.upper()))
- return u"", u' (%s)' % u' '.join(fmt_links)
+ return u"" % def_href, u' (%s)' % u' '.join(fmt_links)
class Exercise(EduModule):
@@ -194,6 +205,8 @@ 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""""""
@@ -257,6 +270,13 @@ class Wybor(Exercise):
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