last merge of edumed-red not complete

[librarian.git] / librarian / pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index de04fc0..68ae384 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -82,7 +82,10 @@ class EduModule(Xmill):
             }
         submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items()))
 
-        opis = submill.generate(element.xpath('opis')[0])
+        if element.xpath('opis'):
+            opis = submill.generate(element.xpath('opis')[0])
+        else:
+            opis = ''
 
         n = element.xpath('wskazowki')
         if n: wskazowki = submill.generate(n[0])
@@ -255,29 +258,13 @@ u"""%(wskazowki)s
 
             return u"<a href='%s'>" % def_href, u'%s</a>%s' % (def_err, more_links)
 
-    def handle_video(self, element):
-        url = element.attrib.get('url')
-        if not url:
-            print '!! <video> missing url'
-            return
-        m = re.match(r'https?://(?:www.)?youtube.com/watch\?(?:.*&)?v=([^&]+)(?:$|&)', url)
-        if not m:
-            print '!! unknown <video> url scheme:', url
-            return
-        return """<iframe width="630" height="384" src="http://www.youtube.com/embed/%s"
-            frameborder="0" allowfullscreen></iframe>""" % m.group(1), ""
-
 
 class Exercise(EduModule):
-    INSTRUCTION = ""
     def __init__(self, *args, **kw):
         self.question_counter = 0
         super(Exercise, self).__init__(*args, **kw)
-        self.instruction_printed = False
 
-    @tagged('div', 'description')
-    def handle_opis(self, element):
-        return "", self.get_instruction()
+    handle_opis = tag('div', 'description')
 
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""
@@ -341,17 +328,8 @@ class Exercise(EduModule):
             (add_class, self.question_counter, solution_s + minimum_s), \
             "</div>"
 
-    def get_instruction(self):
-        if not self.instruction_printed:
-            self.instruction_printed = True
-            return u'<span class="instruction">%s</span>' % self.INSTRUCTION
-        else:
-            return ""
-
-
 
 class Wybor(Exercise):
-    INSTRUCTION = None
     def handle_cwiczenie(self, element):
         pre, post = super(Wybor, self).handle_cwiczenie(element)
         is_single_choice = True
@@ -398,8 +376,6 @@ class Wybor(Exercise):
 
 
 class Uporzadkuj(Exercise):
-    INSTRUCTION = u"Kliknij wybraną odpowiedź i przeciągnij w nowe miejsce."
-
     def handle_pytanie(self, element):
         """
 Overrides the returned content default handle_pytanie
@@ -419,7 +395,6 @@ Overrides the returned content default handle_pytanie
 
 
 class Luki(Exercise):
-    INSTRUCTION = u"Przeciągnij odpowiedzi i upuść w wybranym polu."
     def find_pieces(self, question):
         return question.xpath(".//luka")
 
@@ -455,8 +430,6 @@ class Luki(Exercise):
 
 
 class Zastap(Luki):
-    INSTRUCTION = u"Przeciągnij odpowiedzi i upuść je na słowie lub wyrażeniu, które chcesz zastąpić."
-
     def find_pieces(self, question):
         return question.xpath(".//zastap")
 
@@ -470,24 +443,6 @@ class Zastap(Luki):
 
 
 class Przyporzadkuj(Exercise):
-    INSTRUCTION = [u"Przeciągnij odpowiedzi i upuść w wybranym polu.",
-                   u"Kliknij numer odpowiedzi, przeciągnij i upuść w wybranym polu."]
-
-    def get_instruction(self):
-        print self.options['handles']
-        if not self.instruction_printed:
-            self.instruction_printed = True
-            return u'<span class="instruction">%s</span>' % self.INSTRUCTION[self.options['handles'] and 1 or 0]
-        else:
-            return ""
-
-    def handle_cwiczenie(self, element):
-        pre, post = super(Przyporzadkuj, self).handle_cwiczenie(element)
-        lista_with_handles = element.xpath(".//*[@uchwyty]")
-        if lista_with_handles:
-            self.options = {'handles': True}
-        return pre, post
-
     def handle_pytanie(self, element):
         pre, post = super(Przyporzadkuj, self).handle_pytanie(element)
         minimum = element.attrib.get("min", None)
@@ -507,7 +462,7 @@ class Przyporzadkuj(Exercise):
                 '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)
@@ -519,14 +474,14 @@ class Przyporzadkuj(Exercise):
             if self.options['handles']:
                 return '<li><span data-solution="%s" data-no="%s" class="question-piece draggable handle add-li">%s</span>' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), '</li>'
             else:
-                return '<li data-solution="%s" data-no="%s" class="question-piece draggable">' % (element.attrib['rozw'], self.piece_counter), '</li>'
+                return '<li data-solution="%s" data-no="%s" class="question-piece draggable">' % (element.attrib.get('rozw', ''), self.piece_counter), '</li>'
 
         elif self.options['predicate']:
             if self.options['min']:
                 placeholders = u'<li class="placeholder"/>' * self.options['min']
             else:
                 placeholders = u'<li class="placeholder multiple"/>'
-            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul class="subjects">' + placeholders + '</ul></li>'
+            return '<li data-predicate="%s">' % element.attrib.get('nazwa', ''), '<ul>' + placeholders + '</ul></li>'
 
         else:
             return super(Przyporzadkuj, self).handle_punkt(element)
@@ -576,7 +531,7 @@ class EduModuleFormat(Format):
         order = dict(reversed(k) for k in enumerate(self.PRIMARY_MATERIAL_FORMATS))
         mats = self.materials_by_slug.get(slug, {}).items()
         if not mats:
-            print "!! Material missing: '%s'" % slug
+            pass # print "!! Material missing: '%s'" % slug
         return sorted(mats, key=lambda (x, y): order.get(x, x))
 
     def url_for_material(self, slug, fmt):