From: Marcin Koziej <marcin@koziej.info>
Date: Wed, 30 Oct 2013 14:36:32 +0000 (+0100)
Subject: last merge of edumed-red not complete
X-Git-Url: https://git.mdrn.pl/librarian.git/commitdiff_plain/a36b71e91ec260eae71f133f450fe4de80974461?ds=inline;hp=-c

last merge of edumed-red not complete
---

a36b71e91ec260eae71f133f450fe4de80974461
diff --combined librarian/pyhtml.py
index 6db1701,775def1..68ae384
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@@ -82,10 -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 len(element.xpath('opis')) else ""
 +        if element.xpath('opis'):
 +            opis = submill.generate(element.xpath('opis')[0])
 +        else:
 +            opis = ''
  
          n = element.xpath('wskazowki')
          if n: wskazowki = submill.generate(n[0])
@@@ -199,7 -196,7 +199,7 @@@ u"""%(wskazowki)
                      subgen = EduModule(self.options)
                      definiens_s = subgen.generate(definiens)
              else:
 -                pass # print '!! Missing definiendum in source:', element.text
 +                print '!! Missing definiendum in source:', element.text
  
          return u"<dt>", u"</dt>" + definiens_s
  
@@@ -337,7 -334,7 +337,7 @@@ class Wybor(Exercise)
          if not pytania:
              pytania = [element]
          for p in pytania:
 -            solutions = re.split(r"[, ]+", p.attrib.get('rozw', ''))
 +            solutions = re.split(r"[, ]+", p.attrib['rozw'])
              if len(solutions) != 1:
                  is_single_choice = False
                  break
@@@ -474,14 -471,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>' + placeholders + '</ul></li>'
+             return '<li data-predicate="%s">' % element.attrib.get('nazwa', ''), '<ul>' + placeholders + '</ul></li>'
  
          else:
              return super(Przyporzadkuj, self).handle_punkt(element)
@@@ -531,7 -528,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):