X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/8be494f3ddda9f45ae3e454ec549e06f0eba9380..b10cdf123648beb76120194d7f9bb69fc8433ede:/librarian/pyhtml.py?ds=inline
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 64ac47f..a6f6686 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -5,15 +5,12 @@
#
from lxml import etree
from librarian import IOFile, RDFNS, DCNS, Format
-from xmlutils import Xmill, tag, tagged, ifoption
+from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close
from librarian import functions
import re
import random
-DEFAULT_MATERIAL_FORMAT = 'odt'
-
-
class EduModule(Xmill):
def __init__(self, options=None):
super(EduModule, self).__init__(options)
@@ -31,11 +28,10 @@ class EduModule(Xmill):
""", u""
handle_autor_utworu = tag("span", "author")
- handle_nazwa_utworu = tag("h1", "title")
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('h2')
+ handle_naglowek_scena = 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')
@@ -43,6 +39,21 @@ class EduModule(Xmill):
handle_tytul_dziela = tag('em', 'title')
handle_slowo_obce = tag('em', 'foreign')
+ 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.text = naglowek.text
+ atxt = etree.tostring(a, encoding=unicode)
+ toc.append("
%s" % atxt)
+ toc = "" % "".join(toc)
+ return "Lekcja: ", "
" + toc
+
+ @tagged("h2")
+ def handle_naglowek_rozdzial(self, element):
+ return "", "".join(tag_open_close("a", name=element.text))
+
def handle_uwaga(self, _e):
return None
@@ -75,12 +86,12 @@ class EduModule(Xmill):
%(counter)d.
- %(opis)s
- %(wskazowki)s
+ %(opis)s""" % locals(), \
+u"""%(wskazowki)s
@@ -188,17 +199,31 @@ class EduModule(Xmill):
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))
+ material_err = u' [BRAKUJÄCY MATERIAÅ]'
make_url = lambda f: self.options['urlmapper'] \
.url_for_material(element.attrib['material'], f)
- def_href = make_url(formats[0])
+
+ if 'format' in element.attrib:
+ formats = re.split(r"[, ]+",
+ element.attrib['format'])
+ else:
+ formats = [None]
+
+ try:
+ def_href = make_url(formats[0])
+ def_err = u""
+ except self.options['urlmapper'].MaterialNotFound:
+ def_err = material_err
+ def_href = u""
fmt_links = []
for f in formats[1:]:
- fmt_links.append(u'
%s' % (make_url(f), f.upper()))
+ try:
+ fmt_links.append(u'
%s' % (make_url(f), f.upper()))
+ except self.options['urlmapper'].MaterialNotFound:
+ fmt_links.append(u'
%s%s' % (f.upper(), material_err))
more_links = u' (%s)' % u', '.join(fmt_links) if fmt_links else u''
- return u"
" % def_href, u'%s' % more_links
+ return u"
" % def_href, u'%s%s' % (def_err, more_links)
class Exercise(EduModule):
@@ -266,12 +291,15 @@ class Wybor(Exercise):
def handle_cwiczenie(self, element):
pre, post = super(Wybor, self).handle_cwiczenie(element)
is_single_choice = True
- for p in element.xpath(".//pytanie"):
+ pytania = element.xpath(".//pytanie")
+ if not pytania:
+ pytania = [element]
+ for p in pytania:
solutions = re.split(r"[, ]+", p.attrib['rozw'])
if len(solutions) != 1:
is_single_choice = False
break
- choices = element.xpath(".//*[@nazwa]")
+ choices = p.xpath(".//*[@nazwa]")
uniq = set()
for n in choices: uniq.add(n.attrib['nazwa'])
if len(choices) != len(uniq):
@@ -329,9 +357,12 @@ class Luki(Exercise):
return question.xpath(".//luka")
def solution_html(self, piece):
- return piece.text + ''.join(
- [etree.tostring(n, encoding=unicode)
- for n in piece])
+ sub = EduModule()
+ return sub.generate(piece)
+ # print piece.text
+ # return piece.text + ''.join(
+ # [etree.tostring(n, encoding=unicode)
+ # for n in piece])
def handle_pytanie(self, element):
qpre, qpost = super(Luki, self).handle_pytanie(element)
@@ -427,6 +458,11 @@ class PrawdaFalsz(Exercise):
class EduModuleFormat(Format):
+ DEFAULT_MATERIAL_FORMAT = 'odt'
+
+ class MaterialNotFound(BaseException):
+ pass
+
def __init__(self, wldoc, **kwargs):
super(EduModuleFormat, self).__init__(wldoc, **kwargs)
@@ -438,6 +474,8 @@ class EduModuleFormat(Format):
return IOFile.from_string(html.encode('utf-8'))
def url_for_material(self, slug, fmt=None):
+ if fmt is None:
+ fmt = self.DEFAULT_MATERIAL_FORMAT
# No briliant idea for an API here.
if fmt:
return "%s.%s" % (slug, fmt)