X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a17ace8296df1d91d9f940c80d96a269eba626e5..3d82ed33706fca69f100b7b7c5b9eba970151568:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 106e30b..f358178 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -4,26 +4,30 @@
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from lxml import etree
-from librarian import OutputFile, RDFNS, DCNS
+from librarian import IOFile, RDFNS, DCNS, Format
from xmlutils import Xmill, tag, tagged, ifoption
+from librarian import functions
+import re
import random
+
+
class EduModule(Xmill):
- def __init__(self, *args):
- super(EduModule, self).__init__(*args)
+ 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))
def handle_powiesc(self, element):
return u"""
-
+
""", u"
"
-
handle_autor_utworu = tag("span", "author")
handle_nazwa_utworu = tag("h1", "title")
handle_dzielo_nadrzedne = tag("span", "collection")
@@ -40,7 +44,7 @@ class EduModule(Xmill):
'activity': True,
'activity_counter': self.activity_counter
}
- submill = EduModule()
+ submill = EduModule(self.options)
opis = submill.generate(element.xpath('opis')[0])
@@ -89,7 +93,7 @@ class EduModule(Xmill):
return
def handle_cwiczenie(self, element):
- excercise_handlers = {
+ exercise_handlers = {
'wybor': Wybor,
'uporzadkuj': Uporzadkuj,
'luki': Luki,
@@ -99,16 +103,20 @@ class EduModule(Xmill):
}
typ = element.attrib['typ']
- handler = excercise_handlers[typ](self.options)
+ handler = exercise_handlers[typ](self.options)
return handler.generate(element)
# Lists
def handle_lista(self, element, attrs={}):
ltype = element.attrib.get('typ', 'punkt')
if ltype == 'slowniczek':
- self.options = {'slowniczek': True}
+ surl = element.attrib.get('href', None)
+ sxml = None
+ if surl:
+ sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
+ self.options = {'slowniczek': True, 'slowniczek_xml': sxml }
return '', '
'
-### robie teraz punkty wyboru
+
listtag = {'num': 'ol',
'punkt': 'ul',
'alfa': 'ul',
@@ -128,33 +136,80 @@ class EduModule(Xmill):
else:
return '', ''
+ def handle_definiendum(self, element):
+ nxt = element.getnext()
+ definiens_s = ''
+
+ # let's pull definiens from another document
+ if self.options['slowniczek_xml'] and (not nxt 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)
+
+ return u"", u"" + definiens_s
+
+ def handle_definiens(self, element):
+ return u"", u""
+
+
+ def handle_podpis(self, element):
+ return u"""""", u"
"
+
+ def handle_tabela(self, element):
+ has_frames = int(element.attrib.get("ramki", "0"))
+ if has_frames: frames_c = "framed"
+ else: frames_c = ""
+ return u""""
+
+ def handle_wiersz(self, element):
+ return u"", u"
"
+
+ def handle_kol(self, element):
+ return u"", u" | "
+
def handle_rdf__RDF(self, _):
# ustal w opcjach rzeczy :D
return
+ def handle_link(self, element):
+ if 'material' in element.attrib:
+ formats = re.split(r"[, ]+", element.attrib['format'])
+ fmt_links = []
+ for f in formats:
+ fmt_links.append(u'%s' % (self.options['urlmapper'].url_for_material(element.attrib['material'], f), f.upper()))
-class Excercise(EduModule):
+ return u"", u' (%s)' % u' '.join(fmt_links)
+
+
+class Exercise(EduModule):
def __init__(self, *args, **kw):
self.question_counter = 0
- super(Excercise, self).__init__(*args, **kw)
+ super(Exercise, self).__init__(*args, **kw)
def handle_rozw_kom(self, element):
- return None
+ return u""""""
def handle_cwiczenie(self, element):
- self.options = {'excercise': element.attrib['typ']}
+ self.options = {'exercise': element.attrib['typ']}
self.question_counter = 0
self.piece_counter = 0
pre = u"""
-
+
@@ -181,23 +236,44 @@ class Excercise(EduModule):
add_class += ' handles handles-%s' % handles
self.options = {'handles': handles}
+ minimum = element.attrib.get('min', None)
+ if minimum: minimum_s = ' data-minimum="%d"' % int(minimum)
+ else: minimum_s = ''
return '
' %\
- (add_class, self.question_counter, solution_s), \
- "
"
+ (add_class, self.question_counter, solution_s + minimum_s), \
+ "
"
-class Wybor(Excercise):
+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"):
+ solutions = re.split(r"[, ]+", p.attrib['rozw'])
+ if len(solutions) != 1:
+ is_single_choice = False
+ break
+ self.options = {'single': is_single_choice}
+ return pre, post
+
def handle_punkt(self, element):
- if self.options['excercise'] and element.attrib.get('nazwa', None):
+ if self.options['exercise'] and element.attrib.get('nazwa', None):
qc = self.question_counter
self.piece_counter += 1
no = self.piece_counter
eid = "q%(qc)d_%(no)d" % locals()
aname = element.attrib.get('nazwa', None)
- return u"""
+ if self.options['single']:
+ return u"""
-
+
+"
+ else:
+ return u"""
+
+
"
@@ -205,7 +281,7 @@ class Wybor(Excercise):
return super(Wybor, self).handle_punkt(element)
-class Uporzadkuj(Excercise):
+class Uporzadkuj(Exercise):
def handle_pytanie(self, element):
"""
Overrides the returned content default handle_pytanie
@@ -224,7 +300,7 @@ Overrides the returned content default handle_pytanie
""
-class Luki(Excercise):
+class Luki(Exercise):
def find_pieces(self, question):
return question.xpath("//luka")
@@ -270,20 +346,27 @@ class Zastap(Luki):
% self.piece_counter, ''
-class Przyporzadkuj(Excercise):
+class Przyporzadkuj(Exercise):
+ def handle_pytanie(self, element):
+ pre, post = super(Przyporzadkuj, self).handle_pytanie(element)
+ minimum = element.attrib.get("min", None)
+ if minimum:
+ self.options = {"min": int(minimum)}
+ return pre, post
+
def handle_lista(self, lista):
if 'nazwa' in lista.attrib:
attrs = {
'data-name': lista.attrib['nazwa'],
'class': 'predicate'
- }
+ }
self.options = {'predicate': True}
elif 'cel' in lista.attrib:
attrs = {
'data-target': lista.attrib['cel'],
'class': 'subject'
- }
- self.options = {'subject': True}
+ }
+ self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib}
else:
attrs = {}
pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
@@ -298,14 +381,17 @@ class Przyporzadkuj(Excercise):
return '' % (element.attrib['rozw'], self.piece_counter), ''
elif self.options['predicate']:
- placeholders = u''
+ if self.options['min']:
+ placeholders = u'' * self.options['min']
+ else:
+ placeholders = u''
return '' % element.attrib, ''
else:
return super(Przyporzadkuj, self).handle_punkt(element)
-class PrawdaFalsz(Excercise):
+class PrawdaFalsz(Exercise):
def handle_punkt(self, element):
if 'rozw' in element.attrib:
return u'''
@@ -317,6 +403,24 @@ class PrawdaFalsz(Excercise):
return super(PrawdaFalsz, self).handle_punkt(element)
+class EduModuleFormat(Format):
+ def __init__(self, wldoc, **kwargs):
+ super(EduModuleFormat, self).__init__(wldoc, **kwargs)
+
+ def build(self):
+ edumod = EduModule({'provider': self.wldoc.provider, 'urlmapper': self})
+
+ html = edumod.generate(self.wldoc.edoc.getroot())
+
+ return IOFile.from_string(html.encode('utf-8'))
+
+ def url_for_material(self, slug, fmt=None):
+ # No briliant idea for an API here.
+ if fmt:
+ return "%s.%s" % (slug, fmt)
+ return slug
+
+
def transform(wldoc, stylesheet='edumed', options=None, flags=None):
"""Transforms the WL document to XHTML.
@@ -324,8 +428,5 @@ def transform(wldoc, stylesheet='edumed', options=None, flags=None):
otherwise returns True if file has been written,False if it hasn't.
File won't be written if it has no content.
"""
- edumod = EduModule(options)
-# from pdb import set_trace; set_trace()
- html = edumod.generate(wldoc.edoc.getroot())
-
- return OutputFile.from_string(html.encode('utf-8'))
+ edumodfor = EduModuleFormat(wldoc)
+ return edumodfor.build()