X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/f1ae0a40b774ad7260e7449986764c9104553e03..482477cced586463d7f342cdde8482a4d97d7685:/librarian/pypdf.py?ds=sidebyside

diff --git a/librarian/pypdf.py b/librarian/pypdf.py
index 920f1b9..6aadbc4 100644
--- a/librarian/pypdf.py
+++ b/librarian/pypdf.py
@@ -93,7 +93,7 @@ class EduModule(Xmill):
     @escape(True)
     def get_rightsinfo(self, element):
         rights_lic = self.get_dc(element, 'rights.license', True)
-        return u'<cmd name="rightsinfostr">' + (rights_lic and u'<opt>%s</opt>' % rights_lic or '') + \
+        return u'<cmd name="rightsinfostr">' + (u'<opt>%s</opt>' % rights_lic if rights_lic else '') + \
             u'<parm>%s</parm>' % self.get_dc(element, 'rights', True) + \
             u'</cmd>'
 
@@ -116,9 +116,37 @@ class EduModule(Xmill):
     def get_description(self, element):
         desc = self.get_dc(element, 'description', single=True)
         if not desc:
-            print '!! no descripton'
+            print '!! no description'
         return desc
 
+    @escape(True)
+    def get_curriculum(self, element):
+        ret = []
+        for dc_tag, new in [('subject.curriculum', False), ('subject.curriculum.new', True)]:
+            identifiers = self.get_dc(element, dc_tag)
+            if not identifiers:
+                continue
+            try:
+                from curriculum.templatetags.curriculum_tags import curriculum
+                curr_elements = curriculum(identifiers)
+            except ImportError:
+                curr_elements = {'identifiers': identifiers}
+            items = ['Nowa podstawa programowa:' if new else 'Podstawa programowa:']
+            newline = '<ctrl ch="\\"/>\n'
+            if 'currset' in curr_elements:
+                for (course, level), types in curr_elements['currset'].iteritems():
+                    label = u'klasa' if new else u'poziom edukacyjny'
+                    lines = [u'%s, %s %s' % (course, level, label)]
+                    for type, currs in types.iteritems():
+                        lines.append(type)
+                        lines += [curr.title for curr in currs]
+                    items.append(newline.join(lines))
+            else:
+                items += identifiers
+            ret.append('\n<cmd name="vspace"><parm>.6em</parm></cmd>\n'.join(
+                '<cmd name="akap"><parm>%s</parm></cmd>' % item for item in items))
+        return '\n<cmd name="vspace"><parm>1em</parm></cmd>\n'.join(ret)
+
     def handle_utwor(self, element):
         lines = [
             u'''
@@ -143,6 +171,7 @@ class EduModule(Xmill):
             u'''\\title{%s}''' % self.get_title(element),
             u'''\\def\\bookurl{%s}''' % self.options['wldoc'].book_info.url.canonical(),
             u'''\\def\\rightsinfo{%s}''' % self.get_rightsinfo(element),
+            u'''\\def\\curriculum{%s}''' % self.get_curriculum(element),
             u'</TeXML>'
         ]
 
@@ -510,24 +539,19 @@ class Wybor(Exercise):
         if not pytania:
             pytania = [element]
         for p in pytania:
-            solutions = re.split(r"[, ]+", p.attrib.get('rozw', ''))
+            solutions = p.xpath(".//punkt[@rozw='prawda']")
             if len(solutions) != 1:
                 is_single_choice = False
                 break
-            choices = p.xpath(".//*[@nazwa]")
-            uniq = set()
-            for n in choices:
-                uniq.add(n.attrib.get('nazwa', ''))
-            if len(choices) != len(uniq):
-                is_single_choice = False
-                break
 
         self.options = {'single': is_single_choice}
         return pre, post
 
     def handle_punkt(self, element):
-        if self.options['exercise'] and element.attrib.get('nazwa', None):
+        if self.options['exercise'] and element.attrib.get('rozw', None):
             cmd = 'radio' if self.options['single'] else 'checkbox'
+            if self.options['teacher'] and element.attrib['rozw'] == 'prawda':
+                cmd += 'checked'
             return u'<cmd name="%s"/>' % cmd, ''
         else:
             return super(Wybor, self).handle_punkt(element)