-
%(counter)d.
+
%(counter)d.
%(opis)s
%(wskazowki)s
@@ -74,51 +78,56 @@ class EduModule(Xmill):
""" % locals()
- handle_opis = ifoption(activity=False)(tag('div', 'description'))
- handle_wskazowki = ifoption(activity=False)(tag('div', ('hints', 'teacher')))
-
- @ifoption(activity=False)
+ handle_opis = ifoption(sub_gen=True)(tag('div', 'description'))
+ handle_wskazowki = ifoption(sub_gen=True)(tag('div', ('hints', 'teacher')))
+
+ @ifoption(sub_gen=True)
@tagged('div', 'materials')
def handle_pomoce(self, _):
return "Pomoce: ", ""
-
+
def handle_czas(self, *_):
return
def handle_forma(self, *_):
return
-
+
def handle_cwiczenie(self, element):
- excercise_handlers = {
+ exercise_handlers = {
'wybor': Wybor,
'uporzadkuj': Uporzadkuj,
'luki': Luki,
'zastap': Zastap,
- 'przyporzadkuj': Przyporzadkuj
+ 'przyporzadkuj': Przyporzadkuj,
+ 'prawdafalsz': PrawdaFalsz
}
-
+
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',
+
+ listtag = {'num': 'ol',
+ 'punkt': 'ul',
+ 'alfa': 'ul',
'czytelnia': 'ul'}[ltype]
classes = attrs.get('class', '')
if classes: del attrs['class']
-
+
attrs_s = ' '.join(['%s="%s"' % kv for kv in attrs.items()])
if attrs_s: attrs_s = ' ' + attrs_s
-
+
return '<%s class="lista %s %s"%s>' % (listtag, ltype, classes, attrs_s), '' % listtag
def handle_punkt(self, element):
@@ -127,30 +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
+ 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()))
+
+ return u"", u' (%s)' % u' '.join(fmt_links)
-class Excercise(EduModule):
+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 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"""
-
+
@@ -161,31 +220,60 @@ class Excercise(EduModule):
pre = pre + qpre
post = qpost + post
return pre, post
-
+
def handle_pytanie(self, element):
"""This will handle
element, when there is no
"""
+ add_class = ""
self.question_counter += 1
self.piece_counter = 0
solution = element.attrib.get('rozw', None)
if solution: solution_s = ' data-solution="%s"' % solution
else: solution_s = ''
- return '' %\
- (self.question_counter, solution_s), \
- "
"
+ handles = element.attrib.get('uchwyty', None)
+ if handles:
+ 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 + 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()
- return u"""
-
-
+ aname = element.attrib.get('nazwa', None)
+ if self.options['single']:
+ return u"""
+
+
+"
+ else:
+ return u"""
+
+
"
@@ -193,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
@@ -205,55 +293,132 @@ Overrides the returned content default handle_pytanie
return u"""""" % \
(','.join(order_items), self.question_counter), \
u"""
"""
-
+
def handle_punkt(self, element):
return """""" \
% element.attrib,\
""
-class Luki(Excercise):
+class Luki(Exercise):
+ def find_pieces(self, question):
+ print question.xpath(".//luka")
+ return question.xpath(".//luka")
+
+ def solution_html(self, piece):
+ 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)
+
+ luki = list(enumerate(self.find_pieces(element)))
+ luki_html = ""
+ i = 0
+ random.shuffle(luki)
+ for (i, luka) in luki:
+ i += 1
+ luka_html = self.solution_html(luka)
+ luki_html += u'%s' % (i, luka_html)
+ self.words_html = '%s
' % luki_html
+
+ return qpre, qpost
+
+ def handle_opis(self, element):
+ return '', self.words_html
+
def handle_luka(self, element):
- return '' % element.text
+ self.piece_counter += 1
+ return '' % self.piece_counter
+
+class Zastap(Luki):
+ def find_pieces(self, question):
+ return question.xpath(".//zastap")
+ def solution_html(self, piece):
+ return piece.attrib['rozw']
-class Zastap(Excercise):
def handle_zastap(self, element):
- return '' % element.attrib, ''
+ self.piece_counter += 1
+ return '' \
+ % 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):
- print "in lista %s %s" % (lista.attrib, self.options)
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 = {}
- return super(Przyporzadkuj, self).handle_lista(lista, attrs)
-
+ pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
+ return pre, post + '
'
def handle_punkt(self, element):
- print "in punkt %s %s" % (element.attrib, self.options)
-
if self.options['subject']:
- return '' % element.attrib, ''
+ self.piece_counter += 1
+ if self.options['handles']:
+ return '%s' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), ''
+ else:
+ return '' % (element.attrib['rozw'], self.piece_counter), ''
+
elif self.options['predicate']:
- return '' % element.attrib, ''
+ 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(Exercise):
+ def handle_punkt(self, element):
+ if 'rozw' in element.attrib:
+ return u'''
+
+ Prawda
+ FaÅsz
+ ''' % {'prawda': 'true', 'falsz': 'false'}[element.attrib['rozw']], ''
+ else:
+ 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):
@@ -263,9 +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()