X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/2919eb4f57c7e1c9dead734c685a9b36f34e30ce..dae85cc198c36d58dd2bdd6eaf29f69a5e3cacaa:/librarian/pyhtml.py?ds=sidebyside

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index e9852a7..de04fc0 100644
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -15,6 +15,7 @@ class EduModule(Xmill):
     def __init__(self, options=None):
         super(EduModule, self).__init__(options)
         self.activity_counter = 0
+        self.exercise_counter = 0
 
         # text filters
         def swap_endlines(txt):
@@ -28,7 +29,7 @@ class EduModule(Xmill):
     def handle_strofa(self, element):
         self.options = {'strofa': True}
         return "", ""
-        
+
     def handle_powiesc(self, element):
         return u"""
 <div class="module" id="book-text">
@@ -51,20 +52,24 @@ class EduModule(Xmill):
     handle_tytul_dziela = tag('em', 'title')
     handle_slowo_obce = tag('em', 'foreign')
 
+    def naglowek_to_anchor(self, naglowek):
+        return re.sub(r" +", " ", naglowek.text.strip())
+
     def handle_nazwa_utworu(self, element):
         toc = []
         for naglowek in element.getparent().findall('.//naglowek_rozdzial'):
             a = etree.Element("a")
-            a.attrib["href"] = "#" + naglowek.text
+            a.attrib["href"] = "#" + self.naglowek_to_anchor(naglowek)
             a.text = naglowek.text
             atxt = etree.tostring(a, encoding=unicode)
             toc.append("<li>%s</li>" % atxt)
         toc = "<ul class='toc'>%s</ul>" % "".join(toc)
-        return "<h1 class='title'>Lekcja: ", "</h1>" + toc
+        add_header = "Lekcja: " if self.options['wldoc'].book_info.type in ('course', 'synthetic') else ''
+        return "<h1 class='title'>%s" % add_header, "</h1>" + toc
 
     @tagged("h2")
     def handle_naglowek_rozdzial(self, element):
-        return "", "".join(tag_open_close("a", name=element.text))
+        return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element)))
 
     def handle_uwaga(self, _e):
         return None
@@ -135,6 +140,8 @@ u"""%(wskazowki)s
             }
 
         typ = element.attrib['typ']
+        self.exercise_counter += 1
+        self.options = {'exercise_counter': self.exercise_counter}
         handler = exercise_handlers[typ](self.options)
         return handler.generate(element)
 
@@ -142,7 +149,10 @@ u"""%(wskazowki)s
     def handle_lista(self, element, attrs={}):
         ltype = element.attrib.get('typ', 'punkt')
         if ltype == 'slowniczek':
-            surl = element.attrib.get('href', None)
+            surl = element.attrib.get('src', None)
+            if surl is None:
+                # print '** missing src on <slowniczek>, setting default'
+                surl = 'http://edukacjamedialna.edu.pl/slowniczek'
             sxml = None
             if surl:
                 sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())
@@ -172,16 +182,21 @@ u"""%(wskazowki)s
         nxt = element.getnext()
         definiens_s = ''
 
+        if not element.text:
+            print "!! Empty <definiendum/>"
+            return None
+
         # let's pull definiens from another document
-        if self.options['slowniczek_xml'] and (not nxt or nxt.tag != 'definiens'):
+        if self.options['slowniczek_xml'] is not None and (nxt is None or nxt.tag != 'definiens'):
             sxml = self.options['slowniczek_xml']
-            assert element.text != ''
             defloc = sxml.xpath("//definiendum[text()='%s']" % element.text)
             if defloc:
                 definiens = defloc[0].getnext()
                 if definiens.tag == 'definiens':
                     subgen = EduModule(self.options)
                     definiens_s = subgen.generate(definiens)
+            else:
+                print '!! Missing definiendum in source:', element.text
 
         return u"<dt>", u"</dt>" + definiens_s
 
@@ -212,8 +227,9 @@ u"""%(wskazowki)s
             return tag('a', href=element.attrib['url'])(self, element)
         elif 'material' in element.attrib:
             material_err = u' [BRAKUJĄCY MATERIAŁ]'
+            slug = element.attrib['material']
             make_url = lambda f: self.options['urlmapper'] \
-              .url_for_material(element.attrib['material'], f)
+              .url_for_material(slug, f)
 
             if 'format' in element.attrib:
                 formats = re.split(r"[, ]+",
@@ -221,29 +237,47 @@ u"""%(wskazowki)s
             else:
                 formats = [None]
 
+            formats = self.options['urlmapper'].materials(slug)
+
             try:
-                def_href = make_url(formats[0])
+                def_href = make_url(formats[0][0])
                 def_err = u""
-            except self.options['urlmapper'].MaterialNotFound:
+            except (IndexError, self.options['urlmapper'].MaterialNotFound):
                 def_err = material_err
                 def_href = u""
             fmt_links = []
             for f in formats[1:]:
                 try:
-                    fmt_links.append(u'<a href="%s">%s</a>' % (make_url(f), f.upper()))
+                    fmt_links.append(u'<a href="%s">%s</a>' % (make_url(f[0]), f[0].upper()))
                 except self.options['urlmapper'].MaterialNotFound:
-                    fmt_links.append(u'<a>%s%s</a>' % (f.upper(), material_err))
+                    fmt_links.append(u'<a>%s%s</a>' % (f[0].upper(), material_err))
             more_links = u' (%s)' % u', '.join(fmt_links) if fmt_links else u''
 
             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
 
-    handle_opis = tag('div', 'description')
+    @tagged('div', 'description')
+    def handle_opis(self, element):
+        return "", self.get_instruction()
 
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""
@@ -256,7 +290,16 @@ class Exercise(EduModule):
         pre = u"""
 <div class="exercise %(typ)s" data-type="%(typ)s">
 <form action="#" method="POST">
-""" % element.attrib
+<h3>Zadanie %(exercies_counter)d</h3>
+<div class="buttons">
+<span class="message"></span>
+<input type="button" class="check" value="sprawdź"/>
+<input type="button" class="retry" style="display:none" value="spróbuj ponownie"/>
+<input type="button" class="solutions" value="pokaż rozwiązanie"/>
+<input type="button" class="reset" value="reset"/>
+</div>
+
+""" % {'exercies_counter': self.options['exercise_counter'], 'typ': element.attrib['typ']}
         post = u"""
 <div class="buttons">
 <span class="message"></span>
@@ -298,8 +341,17 @@ 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
@@ -346,6 +398,8 @@ 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
@@ -365,6 +419,7 @@ 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")
 
@@ -400,6 +455,8 @@ 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")
 
@@ -413,6 +470,24 @@ 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)
@@ -432,7 +507,7 @@ class Przyporzadkuj(Exercise):
                 'data-target': lista.attrib['cel'],
                 'class': 'subject'
             }
-            self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib}
+            self.options = {'subject': True}
         else:
             attrs = {}
         pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
@@ -470,7 +545,7 @@ class PrawdaFalsz(Exercise):
 
 
 class EduModuleFormat(Format):
-    DEFAULT_MATERIAL_FORMAT = 'odt'
+    PRIMARY_MATERIAL_FORMATS = ('pdf', 'odt')
 
     class MaterialNotFound(BaseException):
         pass
@@ -479,19 +554,33 @@ class EduModuleFormat(Format):
         super(EduModuleFormat, self).__init__(wldoc, **kwargs)
 
     def build(self):
-        edumod = EduModule({'provider': self.wldoc.provider, 'urlmapper': self})
+        # Sort materials by slug.
+        self.materials_by_slug = {}
+        for name, att in self.wldoc.source.attachments.items():
+            parts = name.rsplit('.', 1)
+            if len(parts) == 1:
+                continue
+            slug, ext = parts
+            if slug not in self.materials_by_slug:
+                self.materials_by_slug[slug] = {}
+            self.materials_by_slug[slug][ext] = att
+
+        edumod = EduModule({'provider': self.wldoc.provider, 'urlmapper': self, 'wldoc': self.wldoc})
 
         html = edumod.generate(self.wldoc.edoc.getroot())
 
         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)
-        return slug
+    def materials(self, slug):
+        """Returns a list of pairs: (ext, iofile)."""
+        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
+        return sorted(mats, key=lambda (x, y): order.get(x, x))
+
+    def url_for_material(self, slug, fmt):
+        return "%s.%s" % (slug, fmt)
 
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):