X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/2919eb4f57c7e1c9dead734c685a9b36f34e30ce..98a3fbdcedc1b8c4da602b8bb8ee304830a6de1b:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index e9852a7..f41c583 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"""
@@ -60,7 +61,8 @@ class EduModule(Xmill):
atxt = etree.tostring(a, encoding=unicode)
toc.append("
%s" % atxt)
toc = "
" % "".join(toc)
- return "
Lekcja: ", "
" + toc
+ add_header = "Lekcja: " if self.options['wldoc'].book_info.type in ('course', 'synthetic') else ''
+ return "
%s" % add_header, "
" + toc
@tagged("h2")
def handle_naglowek_rozdzial(self, element):
@@ -135,6 +137,9 @@ u"""%(wskazowki)s
}
typ = element.attrib['typ']
+ self.exercise_counter += 1
+ print self.exercise_counter
+ self.options = {'exercise_counter': self.exercise_counter}
handler = exercise_handlers[typ](self.options)
return handler.generate(element)
@@ -142,7 +147,10 @@ u"""%(wskazowki)s
def handle_lista(self, element, attrs={}):
ltype = element.attrib.get('typ', 'punkt')
if ltype == 'slowniczek':
- surl = element.attrib.get('href', None)
+ surl = element.attrib.get('src', None)
+ if surl is None:
+ print '** missing src on
, setting default'
+ surl = 'http://edukacjamedialna.edu.pl/slowniczek'
sxml = None
if surl:
sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
@@ -172,16 +180,21 @@ u"""%(wskazowki)s
nxt = element.getnext()
definiens_s = ''
+ if not element.text:
+ print "!! Empty "
+ return None
+
# let's pull definiens from another document
- if self.options['slowniczek_xml'] and (not nxt or nxt.tag != 'definiens'):
+ if self.options['slowniczek_xml'] is not None and (nxt is None or nxt.tag != 'definiens'):
sxml = self.options['slowniczek_xml']
- assert element.text != ''
defloc = sxml.xpath("//definiendum[text()='%s']" % element.text)
if defloc:
definiens = defloc[0].getnext()
if definiens.tag == 'definiens':
subgen = EduModule(self.options)
definiens_s = subgen.generate(definiens)
+ else:
+ print '!! Missing definiendum in source:', element.text
return u"", u"" + definiens_s
@@ -256,7 +269,16 @@ class Exercise(EduModule):
pre = u"""