X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/f32fad702df32d137bc187df8000709e7b90aa14..a36b71e91ec260eae71f133f450fe4de80974461:/librarian/pyhtml.py?ds=inline
diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 2f054a9..68ae384 100644
--- 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])
@@ -471,14 +474,14 @@ class Przyporzadkuj(Exercise):
if self.options['handles']:
return '
%s' % (element.attrib['rozw'], self.piece_counter, self.piece_counter), ''
else:
- return '' % (element.attrib['rozw'], self.piece_counter), ''
+ return '' % (element.attrib.get('rozw', ''), self.piece_counter), ''
elif self.options['predicate']:
if self.options['min']:
placeholders = u'' * self.options['min']
else:
placeholders = u''
- return '' % element.attrib, ''
+ return '' % element.attrib.get('nazwa', ''), ''
else:
return super(Przyporzadkuj, self).handle_punkt(element)
@@ -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):