X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/f03d1fdbe472dbfb103d00b0e4ee9fa593c7b2c0..45aed036278c98bda04414dfd6f216bc5d2f7586:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index a46659c..e5ca40e 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -4,27 +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"""
+
"
-class Wybor(Excercise):
- def handle_pytanie(self, element):
- pre, post = super(Wybor, self).handle_pytanie(element)
- solutions = re.split(r"[, ]+", element.attrib['rozw'])
- if len(solutions) == 1:
- self.options = { 'single': True }
+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
@@ -221,8 +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
@@ -241,9 +300,10 @@ Overrides the returned content default handle_pytanie
""
-class Luki(Excercise):
+class Luki(Exercise):
def find_pieces(self, question):
- return question.xpath("//luka")
+ print question.xpath(".//luka")
+ return question.xpath(".//luka")
def solution_html(self, piece):
return piece.text + ''.join(
@@ -266,8 +326,7 @@ class Luki(Excercise):
return qpre, qpost
def handle_opis(self, element):
- pre, post = super(Luki, self).handle_opis(element)
- return pre, self.words_html + post
+ return '', self.words_html
def handle_luka(self, element):
self.piece_counter += 1
@@ -276,7 +335,7 @@ class Luki(Excercise):
class Zastap(Luki):
def find_pieces(self, question):
- return question.xpath("//zastap")
+ return question.xpath(".//zastap")
def solution_html(self, piece):
return piece.attrib['rozw']
@@ -287,19 +346,26 @@ 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, 'handles': 'uchwyty' in lista.attrib}
else:
attrs = {}
@@ -315,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'''
@@ -334,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.
@@ -341,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()