fnp
/
librarian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
last merge of edumed-red not complete
[librarian.git]
/
librarian
/
pyhtml.py
diff --git
a/librarian/pyhtml.py
b/librarian/pyhtml.py
index
775def1
..
68ae384
100644
(file)
--- 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()))
}
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])
n = element.xpath('wskazowki')
if n: wskazowki = submill.generate(n[0])
@@
-196,7
+199,7
@@
u"""%(wskazowki)s
subgen = EduModule(self.options)
definiens_s = subgen.generate(definiens)
else:
subgen = EduModule(self.options)
definiens_s = subgen.generate(definiens)
else:
- p
ass # p
rint '!! Missing definiendum in source:', element.text
+ print '!! Missing definiendum in source:', element.text
return u"<dt>", u"</dt>" + definiens_s
return u"<dt>", u"</dt>" + definiens_s
@@
-334,7
+337,7
@@
class Wybor(Exercise):
if not pytania:
pytania = [element]
for p in pytania:
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
if len(solutions) != 1:
is_single_choice = False
break