X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/3fceb37e38f4dafc27f8aded08bda692a7a7a2af..22290f82670463d15f15f42cf1fe3ead76a6c08e:/librarian/pypdf.py

diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 759e1f3..bb2881f 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -261,7 +261,7 @@ class EduModule(Xmill):
 
         counter = self.activity_counter
 
-        if element.getnext().tag == 'aktywnosc' or self.activity_last.getnext() == element:
+        if element.getnext().tag == 'aktywnosc' or (self.activity_last and self.activity_last.getnext() == element):
             counter_tex = """<cmd name="activitycounter"><parm>%(counter)d.</parm></cmd>""" % locals()
         else:
             counter_tex = ''
@@ -350,7 +350,10 @@ class EduModule(Xmill):
         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 "'" in (element.text or ''):
+                defloc = sxml.xpath("//definiendum[text()=\"%s\"]" % (element.text or '').strip())
+            else:
+                defloc = sxml.xpath("//definiendum[text()='%s']" % (element.text or '').strip())
             if defloc:
                 definiens = defloc[0].getnext()
                 if definiens.tag == 'definiens':