X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/a17ace8296df1d91d9f940c80d96a269eba626e5..c0761a86fb4687fda8221e56bf911f051fda3499:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 106e30b..4ef04bc 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -6,24 +6,27 @@
from lxml import etree
from librarian import OutputFile, RDFNS, DCNS
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)
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")
@@ -155,6 +158,7 @@ class Excercise(EduModule):
+
@@ -181,13 +185,27 @@ 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):
+ 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):
qc = self.question_counter
@@ -195,9 +213,16 @@ class Wybor(Excercise):
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"""
-
+
"
@@ -271,19 +296,26 @@ class Zastap(Luki):
class Przyporzadkuj(Excercise):
+ 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,7 +330,10 @@ 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: