X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/e0e7693096469f5952eef1c5847dabc9cf797f70..ab001bc37c0f8ee0bb92b8762f5151b5b93f6ccc:/librarian/pyhtml.py
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index fcfb3a6..bb835ae 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -13,29 +13,6 @@ class EduModule(Xmill):
super(EduModule, self).__init__(*args)
self.activity_counter = 0
-
-
-# def handle_utwor(self, element):
-# v = {}
-# # from pdb import *; set_trace()
-# v['title'] = element.xpath('//dc:title/text()', namespaces={'dc':DCNS.uri})[0]
-# return u"""
-#
-#
-#
-#
@@ -117,6 +94,7 @@ class EduModule(Xmill):
'uporzadkuj': Uporzadkuj,
'luki': Luki,
'zastap': Zastap,
+ 'przyporzadkuj': Przyporzadkuj
}
typ = element.attrib['typ']
@@ -159,16 +137,19 @@ class Excercise(EduModule):
self.question_counter = 0
super(Excercise, self).__init__(*args, **kw)
+ def handle_rozw_kom(self, element):
+ return None
+
def handle_cwiczenie(self, element):
self.options = {'excercise': element.attrib['typ']}
self.question_counter = 0
self.piece_counter = 0
- return u"""
+ pre = u"""
"
class Wybor(Excercise):
@@ -208,16 +197,18 @@ class Wybor(Excercise):
class Uporzadkuj(Excercise):
- def handle_cwiczenie(self, element):
- pre, post = super(Uporzadkuj, self).handle_cwiczenie(element)
+ def handle_pytanie(self, element):
+ """
+Overrides the returned content default handle_pytanie
+ """
+ # we ignore the result, returning our own
+ super(Uporzadkuj, self).handle_pytanie(element)
order_items = element.xpath(".//punkt/@rozw")
- import pdb
- if order_items == []: pdb.set_trace()
- return pre + u"""
""" % \
- ','.join(order_items), \
- u"""
""" + post
-
+ return u"""
""" % \
+ (','.join(order_items), self.question_counter), \
+ u"""
"""
+
def handle_punkt(self, element):
return """
""" \
% element.attrib,\
@@ -229,29 +220,40 @@ class Luki(Excercise):
return '
' % element.text
-
class Zastap(Excercise):
def handle_zastap(self, element):
return '
' % element.attrib, ' '
class Przyporzadkuj(Excercise):
- def handle_lista(self, element):
+ 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': 'category'
+ 'class': 'predicate'
}
+ self.options = {'predicate': True}
elif 'cel' in lista.attrib:
attrs = {
'data-target': lista.attrib['cel'],
- 'class': 'object'
+ 'class': 'subject'
}
+ self.options = {'subject': True}
else:
attrs = {}
- return super(Przyporzadkuj, self).handle_lista(element, 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, ' '
+ elif self.options['predicate']:
+ return '
' % element.attrib, ' '
+ else:
+ return super(Przyporzadkuj, self).handle_punkt(element)
def transform(wldoc, stylesheet='edumed', options=None, flags=None):
@@ -261,7 +263,6 @@ 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())