X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/b575a407e307dbf28f9f3347e9f130c31569cfe6..91f6668cbed67a0a6513dd892f04be5cffadf966:/librarian/pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index c039ab8..c76a371 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -37,6 +37,9 @@ class EduModule(Xmill):
     handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3')
     handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph')
     handle_strofa = tag('div', 'stanza')
+    handle_wyroznienie = tag('em')
+    handle_tytul_dziela = tag('em', 'title')
+    handle_slowo_obce = tag('em', 'foreign')
 
     def handle_aktywnosc(self, element):
         self.activity_counter += 1
@@ -157,7 +160,6 @@ class EduModule(Xmill):
     def handle_definiens(self, element):
         return u"<dd>", u"</dd>"
 
-
     def handle_podpis(self, element):
         return u"""<div class="caption">""", u"</div>"
 
@@ -179,9 +181,9 @@ class EduModule(Xmill):
 
     def handle_link(self, element):
         if 'url' in element.attrib:
-            return tag('a', href=element.attrib['url'])(element)
+            return tag('a', href=element.attrib['url'])(self, element)
         elif 'material' in element.attrib:
-            formats = re.split(r"[, ]+", element.attrib['format'])
+            formats = re.split(r"[, ]+", element.attrib.get('format', 'odt'))
             fmt_links = []
             for f in formats:
                 fmt_links.append(u'<a href="%s">%s</a>' % (self.options['urlmapper'].url_for_material(element.attrib['material'], f), f.upper()))
@@ -194,6 +196,8 @@ class Exercise(EduModule):
         self.question_counter = 0
         super(Exercise, self).__init__(*args, **kw)
 
+    handle_opis = tag('div', 'description')
+
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""
 
@@ -257,6 +261,13 @@ class Wybor(Exercise):
             if len(solutions) != 1:
                 is_single_choice = False
                 break
+            choices = element.xpath(".//*[@nazwa]")
+            uniq = set()
+            for n in choices: uniq.add(n.attrib['nazwa'])
+            if len(choices) != len(uniq):
+                is_single_choice = False
+                break
+
         self.options = {'single': is_single_choice}
         return pre, post