X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/decc3a73d631e9e6e9095e2ab7b7803ba6736e77..dae85cc198c36d58dd2bdd6eaf29f69a5e3cacaa:/librarian/pyhtml.py?ds=sidebyside
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 313f155..de04fc0 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -15,6 +15,7 @@ class EduModule(Xmill):
def __init__(self, options=None):
super(EduModule, self).__init__(options)
self.activity_counter = 0
+ self.exercise_counter = 0
# text filters
def swap_endlines(txt):
@@ -28,7 +29,7 @@ class EduModule(Xmill):
def handle_strofa(self, element):
self.options = {'strofa': True}
return "", ""
-
+
def handle_powiesc(self, element):
return u"""
@@ -51,11 +52,14 @@ class EduModule(Xmill):
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.text
+ a.attrib["href"] = "#" + self.naglowek_to_anchor(naglowek)
a.text = naglowek.text
atxt = etree.tostring(a, encoding=unicode)
toc.append("
%s" % atxt)
@@ -65,7 +69,7 @@ class EduModule(Xmill):
@tagged("h2")
def handle_naglowek_rozdzial(self, element):
- return "", "".join(tag_open_close("a", name=element.text))
+ return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element)))
def handle_uwaga(self, _e):
return None
@@ -136,6 +140,8 @@ u"""%(wskazowki)s
}
typ = element.attrib['typ']
+ self.exercise_counter += 1
+ self.options = {'exercise_counter': self.exercise_counter}
handler = exercise_handlers[typ](self.options)
return handler.generate(element)
@@ -145,7 +151,7 @@ u"""%(wskazowki)s
if ltype == 'slowniczek':
surl = element.attrib.get('src', None)
if surl is None:
- print '** missing src on
, setting default'
+ # print '** missing src on , setting default'
surl = 'http://edukacjamedialna.edu.pl/slowniczek'
sxml = None
if surl:
@@ -221,8 +227,9 @@ u"""%(wskazowki)s
return tag('a', href=element.attrib['url'])(self, element)
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(element.attrib['material'], f)
+ .url_for_material(slug, f)
if 'format' in element.attrib:
formats = re.split(r"[, ]+",
@@ -230,29 +237,47 @@ u"""%(wskazowki)s
else:
formats = [None]
+ formats = self.options['urlmapper'].materials(slug)
+
try:
- def_href = make_url(formats[0])
+ def_href = make_url(formats[0][0])
def_err = u""
- except self.options['urlmapper'].MaterialNotFound:
+ except (IndexError, self.options['urlmapper'].MaterialNotFound):
def_err = material_err
def_href = u""
fmt_links = []
for f in formats[1:]:
try:
- fmt_links.append(u'%s' % (make_url(f), f.upper()))
+ fmt_links.append(u'%s' % (make_url(f[0]), f[0].upper()))
except self.options['urlmapper'].MaterialNotFound:
- fmt_links.append(u'%s%s' % (f.upper(), material_err))
+ fmt_links.append(u'%s%s' % (f[0].upper(), material_err))
more_links = u' (%s)' % u', '.join(fmt_links) if fmt_links else u''
return u"" % def_href, u'%s%s' % (def_err, more_links)
+ def handle_video(self, element):
+ url = element.attrib.get('url')
+ if not url:
+ print '!!