X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/3ffce80e2f1c58f741cd6a3d31aa86199e8874f1..b10cdf123648beb76120194d7f9bb69fc8433ede:/librarian/pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 302d790..a6f6686 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -11,9 +11,6 @@ import re
 import random
 
 
-DEFAULT_MATERIAL_FORMAT = 'odt'
-
-
 class EduModule(Xmill):
     def __init__(self, options=None):
         super(EduModule, self).__init__(options)
@@ -89,8 +86,8 @@ class EduModule(Xmill):
 <div class="activity">
  <div class="text">
   <span class="act_counter">%(counter)d.</span>
-  %(opis)s
-  %(wskazowki)s
+  %(opis)s""" % locals(), \
+u"""%(wskazowki)s
  </div>
  <aside class="info">
   <section class="infobox time"><h1>Czas</h1><p>%(czas)s min</p></section>
@@ -202,17 +199,31 @@ class EduModule(Xmill):
         if 'url' in element.attrib:
             return tag('a', href=element.attrib['url'])(self, element)
         elif 'material' in element.attrib:
-            formats = re.split(r"[, ]+",
-                               element.attrib.get('format', DEFAULT_MATERIAL_FORMAT))
+            material_err = u' [BRAKUJĄCY MATERIAŁ]'
             make_url = lambda f: self.options['urlmapper'] \
               .url_for_material(element.attrib['material'], f)
-            def_href = make_url(formats[0])
+
+            if 'format' in element.attrib:
+                formats = re.split(r"[, ]+",
+                               element.attrib['format'])
+            else:
+                formats = [None]
+
+            try:
+                def_href = make_url(formats[0])
+                def_err = u""
+            except self.options['urlmapper'].MaterialNotFound:
+                def_err = material_err
+                def_href = u""
             fmt_links = []
             for f in formats[1:]:
-                fmt_links.append(u'<a href="%s">%s</a>' % (make_url(f), f.upper()))
+                try:
+                    fmt_links.append(u'<a href="%s">%s</a>' % (make_url(f), f.upper()))
+                except self.options['urlmapper'].MaterialNotFound:
+                    fmt_links.append(u'<a>%s%s</a>' % (f.upper(), material_err))
             more_links = u' (%s)' % u', '.join(fmt_links) if fmt_links else u''
 
-            return u"<a href='%s'>" % def_href, u'</a>%s' % more_links
+            return u"<a href='%s'>" % def_href, u'%s</a>%s' % (def_err, more_links)
 
 
 class Exercise(EduModule):
@@ -281,14 +292,14 @@ class Wybor(Exercise):
         pre, post = super(Wybor, self).handle_cwiczenie(element)
         is_single_choice = True
         pytania = element.xpath(".//pytanie")
-        if not pytania: 
+        if not pytania:
             pytania = [element]
         for p in pytania:
             solutions = re.split(r"[, ]+", p.attrib['rozw'])
             if len(solutions) != 1:
                 is_single_choice = False
                 break
-            choices = element.xpath(".//*[@nazwa]")
+            choices = p.xpath(".//*[@nazwa]")
             uniq = set()
             for n in choices: uniq.add(n.attrib['nazwa'])
             if len(choices) != len(uniq):
@@ -346,9 +357,12 @@ class Luki(Exercise):
         return question.xpath(".//luka")
 
     def solution_html(self, piece):
-        return piece.text + ''.join(
-            [etree.tostring(n, encoding=unicode)
-             for n in piece])
+        sub = EduModule()
+        return sub.generate(piece)
+        # print piece.text
+        # 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)
@@ -444,6 +458,11 @@ class PrawdaFalsz(Exercise):
 
 
 class EduModuleFormat(Format):
+    DEFAULT_MATERIAL_FORMAT = 'odt'
+
+    class MaterialNotFound(BaseException):
+        pass
+
     def __init__(self, wldoc, **kwargs):
         super(EduModuleFormat, self).__init__(wldoc, **kwargs)
 
@@ -455,6 +474,8 @@ class EduModuleFormat(Format):
         return IOFile.from_string(html.encode('utf-8'))
 
     def url_for_material(self, slug, fmt=None):
+        if fmt is None:
+            fmt = self.DEFAULT_MATERIAL_FORMAT
         # No briliant idea for an API here.
         if fmt:
             return "%s.%s" % (slug, fmt)