X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/0d3fb261fc396c2f8f66018ff923bf202e869b35..79da3449684beeb938735346e1d66093f51ba36d:/librarian/pyhtml.py?ds=sidebyside
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 64629d7..bd3bbce 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"""
-#
-#
-#
-#
-# %(title)s
-#
-#
-#
-#
-#
-# """ % v, u"""
-#
-#
-# """
-
-
def handle_powiesc(self, element):
return u"""
@@ -114,7 +91,10 @@ class EduModule(Xmill):
def handle_cwiczenie(self, element):
excercise_handlers = {
'wybor': Wybor,
- 'uporzadkuj': Uporzadkuj
+ 'uporzadkuj': Uporzadkuj,
+ 'luki': Luki,
+ 'zastap': Zastap,
+ 'przyporzadkuj': Przyporzadkuj
}
typ = element.attrib['typ']
@@ -122,7 +102,7 @@ class EduModule(Xmill):
return handler.generate(element)
# Lists
- def handle_lista(self, element):
+ def handle_lista(self, element, attrs={}):
ltype = element.attrib.get('typ', 'punkt')
if ltype == 'slowniczek':
self.options = {'slowniczek': True}
@@ -133,7 +113,13 @@ class EduModule(Xmill):
'alfa': 'ul',
'czytelnia': 'ul'}[ltype]
- return '<%s class="lista %s">' % (listtag, ltype), '%s>' % listtag
+ 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), '%s>' % listtag
def handle_punkt(self, element):
if self.options['slowniczek']:
@@ -190,7 +176,9 @@ class Wybor(Excercise):
no = self.piece_counter
eid = "q%(qc)d_%(no)d" % locals()
return u"""
-
""" + post
def handle_punkt(self, element):
- return """""" % element.attrib,\
+ return """""" \
+ % element.attrib,\
""
class Luki(Excercise):
def handle_luka(self, element):
- return '' % element.text, \
- ''
+ return '' % element.text
+
class Zastap(Excercise):
def handle_zastap(self, element):
- return '' % element.attrib, ''
+ return '' % element.attrib, ''
+
+
+class Przyporzadkuj(Excercise):
+ 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}
+ else:
+ attrs = {}
+ return super(Przyporzadkuj, self).handle_lista(lista, attrs)
+
+
+ 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)