last merge of edumed-red not complete

[librarian.git] / librarian / pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 88331a9..68ae384 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -15,7 +15,20 @@ class EduModule(Xmill):
     def __init__(self, options=None):
         super(EduModule, self).__init__(options)
         self.activity_counter = 0
     def __init__(self, options=None):
         super(EduModule, self).__init__(options)
         self.activity_counter = 0

+        self.exercise_counter = 0
+
+        # text filters
+        def swap_endlines(txt):
+            if self.options['strofa']:
+                txt = txt.replace("/\n", "<br/>\n")
+            return txt

         self.register_text_filter(functions.substitute_entities)
         self.register_text_filter(functions.substitute_entities)

+        self.register_text_filter(swap_endlines)
+
+    @tagged('div', 'stanza')
+    def handle_strofa(self, element):
+        self.options = {'strofa': True}
+        return "", ""

 
     def handle_powiesc(self, element):
         return u"""
 
     def handle_powiesc(self, element):
         return u"""


@@ -34,25 +47,29 @@ class EduModule(Xmill):
     handle_naglowek_scena = tag('h2')
     handle_naglowek_osoba = handle_naglowek_podrozdzial = tag('h3')
     handle_akap = handle_akap_dialog = handle_akap_cd = tag('p', 'paragraph')
     handle_naglowek_scena = tag('h2')
     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')
 
     handle_wyroznienie = tag('em')
     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")
     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)
             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):
 
     @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
 
     def handle_uwaga(self, _e):
         return None


@@ -65,7 +82,10 @@ class EduModule(Xmill):
             }
         submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items()))
 
             }
         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])
 
         n = element.xpath('wskazowki')
         if n: wskazowki = submill.generate(n[0])


@@ -86,8 +106,8 @@ class EduModule(Xmill):
 <div class="activity">
  <div class="text">
   <span class="act_counter">%(counter)d.</span>
 <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>
  </div>
  <aside class="info">
   <section class="infobox time"><h1>Czas</h1><p>%(czas)s min</p></section>


@@ -123,6 +143,8 @@ class EduModule(Xmill):
             }
 
         typ = element.attrib['typ']
             }
 
         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)
 
         handler = exercise_handlers[typ](self.options)
         return handler.generate(element)
 


@@ -130,7 +152,10 @@ class EduModule(Xmill):
     def handle_lista(self, element, attrs={}):
         ltype = element.attrib.get('typ', 'punkt')
         if ltype == 'slowniczek':
     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())
             sxml = None
             if surl:
                 sxml = etree.fromstring(self.options['provider'].by_uri(surl).get_string())


@@ -160,16 +185,21 @@ class EduModule(Xmill):
         nxt = element.getnext()
         definiens_s = ''
 
         nxt = element.getnext()
         definiens_s = ''
 

+        if not element.text:
+            print "!! Empty <definiendum/>"
+            return None
+

         # let's pull definiens from another document
         # 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']
             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)
             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
 
 
         return u"<dt>", u"</dt>" + definiens_s
 


@@ -200,8 +230,9 @@ class EduModule(Xmill):
             return tag('a', href=element.attrib['url'])(self, element)
         elif 'material' in element.attrib:
             material_err = u' [BRAKUJĄCY MATERIAŁ]'
             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'] \
             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"[, ]+",
 
             if 'format' in element.attrib:
                 formats = re.split(r"[, ]+",


@@ -209,18 +240,20 @@ class EduModule(Xmill):
             else:
                 formats = [None]
 
             else:
                 formats = [None]
 

+            formats = self.options['urlmapper'].materials(slug)
+

             try:
             try:

-                def_href = make_url(formats[0])
+                def_href = make_url(formats[0][0])

                 def_err = u""
                 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:
                 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:
                 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)
             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)


@@ -244,7 +277,16 @@ class Exercise(EduModule):
         pre = u"""
 <div class="exercise %(typ)s" data-type="%(typ)s">
 <form action="#" method="POST">
         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>
         post = u"""
 <div class="buttons">
 <span class="message"></span>


@@ -292,14 +334,14 @@ class Wybor(Exercise):
         pre, post = super(Wybor, self).handle_cwiczenie(element)
         is_single_choice = True
         pytania = element.xpath(".//pytanie")
         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
             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):
             uniq = set()
             for n in choices: uniq.add(n.attrib['nazwa'])
             if len(choices) != len(uniq):


@@ -357,9 +399,12 @@ class Luki(Exercise):
         return question.xpath(".//luka")
 
     def solution_html(self, piece):
         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)
 
     def handle_pytanie(self, element):
         qpre, qpost = super(Luki, self).handle_pytanie(element)


@@ -429,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:
             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"/>'
 
         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)
 
         else:
             return super(Przyporzadkuj, self).handle_punkt(element)


@@ -455,7 +500,7 @@ class PrawdaFalsz(Exercise):
 
 
 class EduModuleFormat(Format):
 
 
 class EduModuleFormat(Format):

-    DEFAULT_MATERIAL_FORMAT = 'odt'
+    PRIMARY_MATERIAL_FORMATS = ('pdf', 'odt')

 
     class MaterialNotFound(BaseException):
         pass
 
     class MaterialNotFound(BaseException):
         pass


@@ -464,19 +509,33 @@ class EduModuleFormat(Format):
         super(EduModuleFormat, self).__init__(wldoc, **kwargs)
 
     def build(self):
         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'))
 
 
         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:
+            pass # 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):
 
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):